bk commit into 5.1 tree (cmiller:1.2320)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-23 09:51:20-04:00, cmiller@stripped +6 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.1
  into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
  MERGE: 1.2300.26.41

  BitKeeper/etc/ignore@stripped, 2006-09-23 09:51:11-04:00, cmiller@stripped +0 -0
    auto-union
    MERGE: 1.253.1.3

  mysql-test/mysql-test-run.pl@stripped, 2006-09-23 09:51:15-04:00,
cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.170.1.2

  mysql-test/t/disabled.def@stripped, 2006-09-23 09:51:16-04:00, cmiller@stripped
+0 -0
    Auto merged
    MERGE: 1.204.1.2

  sql/Makefile.am@stripped, 2006-09-23 09:51:16-04:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.155.1.3

  sql/sql_yacc.yy@stripped, 2006-09-23 09:51:16-04:00, cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.499.1.1

  storage/innobase/handler/ha_innodb.cc@stripped, 2006-09-23 09:51:16-04:00,
cmiller@stripped +0 -0
    Auto merged
    MERGE: 1.295.1.4

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-5.1-maint/RESYNC

--- 1.158/sql/Makefile.am	2006-09-23 09:51:26 -04:00
+++ 1.159/sql/Makefile.am	2006-09-23 09:51:26 -04:00
@@ -52,7 +52,7 @@ noinst_HEADERS =	item.h item_func.h item
 			ha_partition.h \
 			ha_ndbcluster.h ha_ndbcluster_binlog.h \
 			ha_ndbcluster_tables.h \
-			opt_range.h protocol.h rpl_tblmap.h \
+			opt_range.h protocol.h rpl_tblmap.h rpl_utility.h \
 			log.h sql_show.h rpl_rli.h \
 			sql_select.h structs.h table.h sql_udf.h hash_filo.h \
 			lex.h lex_symbol.h sql_acl.h sql_crypt.h  \
@@ -93,7 +93,7 @@ mysqld_SOURCES =	sql_lex.cc sql_handler.
 			sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \
 			sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \
 			slave.cc sql_repl.cc rpl_filter.cc rpl_tblmap.cc \
-			rpl_injector.cc \
+			rpl_utility.cc rpl_injector.cc \
                         sql_union.cc sql_derived.cc \
 			client.c sql_client.cc mini_client_errors.c pack.c\
 			stacktrace.c repl_failsafe.h repl_failsafe.cc \
@@ -121,8 +121,9 @@ DEFS =			-DMYSQL_SERVER \
 			@DEFS@
 
 BUILT_SOURCES =		sql_yacc.cc sql_yacc.h lex_hash.h
-EXTRA_DIST =		udf_example.c $(BUILT_SOURCES) \
-			nt_servc.cc nt_servc.h message.mc CMakeLists.txt
+EXTRA_DIST =		udf_example.c udf_example.def $(BUILT_SOURCES) \
+			nt_servc.cc nt_servc.h message.mc CMakeLists.txt \
+			udf_example.c udf_example.def
 CLEANFILES =        	lex_hash.h sql_yacc.cc sql_yacc.h sql_yacc.output
 AM_YFLAGS =		-d --debug --verbose
 

--- 1.502/sql/sql_yacc.yy	2006-09-23 09:51:26 -04:00
+++ 1.503/sql/sql_yacc.yy	2006-09-23 09:51:26 -04:00
@@ -1353,7 +1353,7 @@ event_tail:
             Lex->sql_command= SQLCOM_CREATE_EVENT;
             Lex->expr_allows_subselect= TRUE;
           }
-
+      ;
 
 ev_schedule_time: EVERY_SYM expr interval
 	  {

--- 1.183/mysql-test/mysql-test-run.pl	2006-09-23 09:51:26 -04:00
+++ 1.184/mysql-test/mysql-test-run.pl	2006-09-23 09:51:26 -04:00
@@ -1245,7 +1245,9 @@ sub executable_setup () {
     $exe_ndbd=           "$glob_basedir/storage/ndb/src/kernel/ndbd";
     $exe_ndb_mgmd=       "$glob_basedir/storage/ndb/src/mgmsrv/ndb_mgmd";
     $lib_udf_example=
-      mtr_file_exists("$glob_basedir/sql/.libs/udf_example.so");
+      mtr_file_exists("$glob_basedir/sql/.libs/udf_example.so",
+                      "$glob_basedir/sql/release/udf_example.dll",
+                      "$glob_basedir/sql/debug/udf_example.dll");
   }
   else
   {

--- 1.205/mysql-test/t/disabled.def	2006-09-23 09:51:26 -04:00
+++ 1.206/mysql-test/t/disabled.def	2006-09-23 09:51:26 -04:00
@@ -35,12 +35,12 @@ rpl_ndb_innodb2ndb       : Bug #19710  C
 rpl_ndb_myisam2ndb       : Bug #19710  Cluster replication to partition table fails on
DELETE FROM statement
 rpl_row_blob_innodb      : BUG#18980 2006-04-10 kent    Test fails randomly
 rpl_sp                   : BUG#16456 2006-02-16 jmiller
+rpl_multi_engine         : BUG#22583 2006-09-23 lars
 
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug
open
 #ndb_binlog_ddl_multi     : BUG#18976 2006-04-10 kent    CRBR: multiple binlog, second
binlog may miss schema log events
 #rpl_ndb_idempotent       : BUG#21298 2006-07-27 msvensson
 #rpl_row_basic_7ndb       : BUG#21298 2006-07-27 msvensson
 #rpl_truncate_7ndb        : BUG#21298 2006-07-27 msvensson
-rpl_ndb_dd_advance       : BUG#18679 2006-07-28 jimw (Test fails randomly)
 ndb_binlog_discover      : bug#21806 2006-08-24
 ndb_autodiscover3        : bug#21806