Merge trift2.:/MySQL/M51/mysql-5.1

into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
extra/yassl/src/handshake.cpp:
  Auto merged
extra/yassl/src/template_instnt.cpp:
  Auto merged
extra/yassl/src/yassl_imp.cpp:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
storage/ndb/src/common/util/OutputStream.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Auto merged
storage/ndb/tools/waiter.cpp:
  Auto merged

include/my_base.h

@@ -419,7 +419,9 @@ enum ha_base_keytype {
                                             statement */
 #define HA_ERR_CORRUPT_EVENT      171    /* The event was corrupt, leading to
                                             illegal data being read */
-#define HA_ERR_LAST              171     /*Copy last error nr.*/
+#define HA_ERR_ROWS_EVENT_APPLY   172    /* The event could not be processed
+                                            no other hanlder error happened */
+#define HA_ERR_LAST              172     /*Copy last error nr.*/
 /* Add error numbers before HA_ERR_LAST and change it accordingly. */
 #define HA_ERR_ERRORS            (HA_ERR_LAST - HA_ERR_FIRST + 1)
 

mysql-test/extra/rpl_tests/rpl_stm_charset.test → mysql-test/extra/rpl_tests/rpl_charset.test

 # Replication of character sets.
 # This test will fail if the server/client does not support enough charsets.
 
-# Requires statement logging
--- source include/have_binlog_format_mixed_or_statement.inc
-
 source include/master-slave.inc;
 --disable_warnings
 set timestamp=1000000000;
@@ -52,14 +49,10 @@ insert into t1 (b) values(@@character_set_client);
 # collation_client does not exist
 insert into t1 (b) values(@@character_set_connection);
 insert into t1 (b) values(@@collation_connection);
---disable_query_log
-select "--- --master--" as "";
---enable_query_log
+--echo --- --master--
 select * from t1 order by a;
 sync_slave_with_master;
---disable_query_log
-select "--- --slave--" as "";
---enable_query_log
+--echo --- --slave--
 select * from mysqltest2.t1 order by a;
 
 connection master;
@@ -70,14 +63,10 @@ insert into t1 (b) values(LEAST("M
 set collation_connection=latin1_german2_ci;
 insert into t1 (b) values(@@collation_connection);
 insert into t1 (b) values(LEAST("Müller","Muffler"));
---disable_query_log
-select "--- --master--" as "";
---enable_query_log
+--echo --- --master--
 select * from t1 order by a;
 sync_slave_with_master;
---disable_query_log
-select "--- --slave--" as "";
---enable_query_log
+--echo --- --slave--
 select * from mysqltest2.t1 order by a;
 
 # Presently charset info is not logged with LOAD DATA but it will
@@ -96,20 +85,15 @@ connection master;
 set @a= _cp850 'Müller' collate cp850_general_ci;
 truncate table t1;
 insert into t1 (b) values(collation(@a));
---disable_query_log
-select "--- --master--" as "";
---enable_query_log
+--echo --- --master--
 select * from t1 order by a;
 sync_slave_with_master;
---disable_query_log
-select "--- --slave--" as "";
---enable_query_log
+--echo --- --slave--
 select * from mysqltest2.t1 order by a;
 
 connection master;
 drop database mysqltest2;
 drop database mysqltest3;
-source include/show_binlog_events.inc;
 sync_slave_with_master;
 
 # Check that we can change global.collation_server (since 5.0.3)
@@ -153,10 +137,6 @@ sync_slave_with_master;
 select hex(c1), hex(c2) from t1;
 
 connection master;
-# Let's have a look at generated SETs.
-flush logs;
---replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000001 
 drop table t1;
 sync_slave_with_master;
 

mysql-test/extra/rpl_tests/rpl_ndb_apply_status.test

@@ -50,17 +50,30 @@ insert into t1 values (1,2);
 --echo
 
 connection master;
-# here is actually a bug, since there is no begin statement, the
-# query is autocommitted, and end_pos shows end of the insert and not
-# end of the commit
+--echo # Now check that that is in the apply_status table is consistant
+--echo # with what is in the binlog
+--echo
+--echo # since insert is done with transactional engine, expect a BEGIN
+--echo # at <start_pos>
+--echo
 --replace_result $start_pos <start_pos>
 --replace_column 5 #
 --eval show binlog events from $start_pos limit 1
+
+--echo
+--echo # Now the insert, one step after
+--echo
+--replace_result $start_pos <start_pos>
+--replace_column 2 # 5 #
+--eval show binlog events from $start_pos limit 1,1
+
+--echo
+--echo # and the COMMIT should be at <end_pos>
 --echo
 --replace_result $start_pos <start_pos> $end_pos <end_pos>
 --replace_column 2 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
---eval show binlog events from $start_pos limit 1,1
+--eval show binlog events from $start_pos limit 2,1
 
 --echo
 

mysql-test/extra/rpl_tests/rpl_row_charset.test

-# Replication of character sets.
-# This test will fail if the server/client does not support enough charsets.
-
---disable_warnings
-set timestamp=1000000000;
-drop database if exists mysqltest2;
-drop database if exists mysqltest3;
---enable_warnings
-
-create database mysqltest2 character set latin2;
-set @@character_set_server=latin5;      
-create database mysqltest3;
---disable_query_log
-select "--- --master--" as "";
---enable_query_log
-show create database mysqltest2;
-show create database mysqltest3;
-sync_slave_with_master;
---disable_query_log
-select "--- --slave--" as "";
---enable_query_log
-show create database mysqltest2;
-show create database mysqltest3;
-
-connection master;
-set @@collation_server=armscii8_bin;
-drop database mysqltest3;
-create database mysqltest3;
---disable_query_log
-select "--- --master--" as "";
---enable_query_log
-show create database mysqltest3;
-sync_slave_with_master;
---disable_query_log
-select "--- --slave--" as "";
---enable_query_log
-show create database mysqltest3;
-
-connection master;
-use mysqltest2;
---eval create table t1 (a int auto_increment primary key, b varchar(100))engine=$engine_type;
-set character_set_client=cp850, collation_connection=latin2_croatian_ci;
-insert into t1 (b) values(@@character_set_server);
-insert into t1 (b) values(@@collation_server);
-# character_set_database and collation_database are not tested as they
-# needn't be replicated (Bar said in Jan 2005).
-insert into t1 (b) values(@@character_set_client);
-# collation_client does not exist
-insert into t1 (b) values(@@character_set_connection);
-insert into t1 (b) values(@@collation_connection);
---disable_query_log
-select "--- --master--" as "";
---enable_query_log
-select * from t1 order by a;
-sync_slave_with_master;
---disable_query_log
-select "--- --slave--" as "";
---enable_query_log
-select * from mysqltest2.t1 order by a;
-
-select "--- --muller--" as "";
-connection master;
-set character_set_client=latin1, collation_connection=latin1_german1_ci;
-truncate table t1;
-insert into t1 (b) values(@@collation_connection);
-insert into t1 (b) values(LEAST("Mller","Muffler"));
-set collation_connection=latin1_german2_ci;
-insert into t1 (b) values(@@collation_connection);
-insert into t1 (b) values(LEAST("Mller","Muffler"));
---disable_query_log
-select "--- --master--" as "";
---enable_query_log
-select * from t1 order by a;
-sync_slave_with_master;
---disable_query_log
-select "--- --slave--" as "";
---enable_query_log
-select * from mysqltest2.t1 order by a;
-
-# Presently charset info is not logged with LOAD DATA but it will
-# change in Jan 2005 when Dmitri pushes his new LOAD DATA,
-# before 5.0.3 goes out. When done, LOAD DATA INFILE should be tested
-# here.
-
-# See if user var is prefixed with collation in binlog and replicated well.
-# Note: replication of user variables is broken as far as derivation is
-# concerned. That's because when we store a user variable in the binlog,
-# we lose its derivation. So later on the slave, it's impossible to
-# know if the collation was explicit or not, so we use DERIVATION_NONE,
-# which provokes error messages (like 'Illegal mix of collation') when
-# we replay the master's INSERT/etc statements.
-
-
-select "--- --INSERT--" as "";
-connection master;
-set @a= _cp850 'Mller' collate cp850_general_ci;
-truncate table t1;
-insert into t1 (b) values(collation(@a));
---disable_query_log
-select "--- --master--" as "";
---enable_query_log
-select * from t1 order by a;
-sync_slave_with_master;
---disable_query_log
-select "--- --slave--" as "";
---enable_query_log
-select * from mysqltest2.t1 order by a;
-
-connection master;
-drop database mysqltest2;
-drop database mysqltest3;
-source include/show_binlog_events.inc;
-sync_slave_with_master;
-
-# Check that we can change global.collation_server (since 5.0.3)
-
-select "--- --global--" as "";
-set global character_set_server=latin2;
-set global character_set_server=latin1; # back
-connection master;
-set global character_set_server=latin2;
-set global character_set_server=latin1; # back
-
-# Check that SET ONE_SHOT is really one shot
-
-select "--- --oneshot--" as "";
-set one_shot @@character_set_server=latin5;
-set @@max_join_size=1000;
-select @@character_set_server;
-select @@character_set_server;
-set @@character_set_server=latin5;
-select @@character_set_server;
-select @@character_set_server;
-
-# ONE_SHOT on not charset/collation stuff is not allowed
--- error 1382
-set one_shot max_join_size=10;
-
-# Test of wrong character set numbers;
-error 1115;
-set character_set_client=9999999;
-error 1273;
-set collation_server=9999998;
-
-# This one was contributed by Sergey Petrunia (BUG#3943)
-
-select "--- --3943--" as "";
-use test;
---eval CREATE TABLE t1 (c1 VARBINARY(255), c2 VARBINARY(255))ENGINE=$engine_type;
-SET CHARACTER_SET_CLIENT=koi8r,
- CHARACTER_SET_CONNECTION=cp1251, 
- CHARACTER_SET_RESULTS=koi8r;
-INSERT INTO t1 (c1, c2) VALUES (',  ',',  ');
-SET SQL_BIG_SELECTS=1;
-select hex(c1), hex(c2) from t1;
-sync_slave_with_master;
-SET SQL_BIG_SELECTS=1;
-select hex(c1), hex(c2) from t1;
-
-connection master;
-# Let's have a look at generated SETs.
---replace_result $MYSQLTEST_VARDIR MYSQL_TEST_DIR/var
-#--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000001 
-drop table t1;
-sync_slave_with_master;
-
-#
-#  BUG#6676: Derivation of variables must be correct on slave
-#
-select "--- --6676--" as "";
-connection master;
-eval create table `t1` (
-  `pk` varchar(10) not null default '', 
-  primary key (`pk`)
-) engine=$engine_type default charset=latin1;
-set @p=_latin1 'test';
-update t1 set pk='test' where pk=@p;
-drop table t1;
-sync_slave_with_master;

mysql-test/extra/rpl_tests/rpl_row_tabledefs.test

@@ -46,7 +46,7 @@ ALTER TABLE t1_bit
 ALTER TABLE t1_char ADD x CHAR(20) DEFAULT 'Just a test';
 # ... and add one non-nullable INT column last in table 't1_text'
 #     with no default,
-ALTER TABLE t1_nodef ADD x INT NOT NULL;
+ALTER TABLE t1_nodef ADD x INT NOT NULL, ADD y INT NOT NULL, ADD z INT NOT NULL;
 # ... and remove the last column in t2
 ALTER TABLE t2 DROP b;
 # ... change the type of the single column in table 't4'
@@ -222,8 +222,8 @@ sync_slave_with_master;
 
 --echo **** On Slave ****
 connection slave;
-INSERT INTO t1_nodef VALUES (1,2,3);
-INSERT INTO t1_nodef VALUES (2,4,6);
+INSERT INTO t1_nodef VALUES (1,2,3,4,5);
+INSERT INTO t1_nodef VALUES (2,4,6,8,10);
 
 --echo **** On Master ****
 connection master;

mysql-test/lib/mtr_cases.pl

@@ -889,6 +889,7 @@ our @tags=
  ["include/have_ndb.inc", "ndb_test", 1],
  ["include/have_multi_ndb.inc", "ndb_test", 1],
  ["include/have_ndb_extra.inc", "ndb_extra", 1],
+ ["include/ndb_master-slave.inc", "ndb_test", 1],
  ["require_manager", "require_manager", 1],
 );
 

mysql-test/mysql-test-run.pl

@@ -136,9 +136,12 @@ our $opt_suites;
 our $opt_suites_default= "main,binlog,rpl,rpl_ndb,ndb"; # Default suites to run
 our @extra_suites=
 (
- ["mysql-5.1-new-ndb",   "ndb_team"],
- ["mysql-5.1-telco-6.2", "ndb_team"],
- ["mysql-5.1-telco-6.3", "ndb_team"],
+ ["mysql-5.1-new-ndb",         "ndb_team"],
+ ["mysql-5.1-new-ndb-merge",   "ndb_team"],
+ ["mysql-5.1-telco-6.2",       "ndb_team"],
+ ["mysql-5.1-telco-6.2-merge", "ndb_team"],
+ ["mysql-5.1-telco-6.3",       "ndb_team"],
+ ["mysql-6.0-ndb",             "ndb_team"],
 );
 
 
@@ -413,13 +416,20 @@ sub main () {
     {
       # use default and add any extra_suites as defined
       $opt_suites= $opt_suites_default;
-      my $ddd= basename(dirname($glob_mysql_test_dir));
-      foreach my $extra_suite (@extra_suites)
+      my $ccc= dirname($glob_mysql_test_dir);
+      my $found= 0;
+      while (!$found and !($ccc eq "/") and !($ccc eq ""))
       {
-	if ($extra_suite->[0] eq "$ddd")
+	my $ddd= basename($ccc);
+	foreach my $extra_suite (@extra_suites)
 	{
-	  $opt_suites= "$extra_suite->[1],$opt_suites";
+	  if ($extra_suite->[0] eq "$ddd")
+	  {
+	    $opt_suites= "$extra_suite->[1],$opt_suites";
+	    $found= 1;
+	  }
 	}
+	$ccc= dirname($ccc);
       }
     }
 

mysql-test/r/events_scheduling.result

@@ -78,11 +78,6 @@ FROM INFORMATION_SCHEMA.EVENTS
 WHERE EVENT_SCHEMA=DATABASE() AND EVENT_NAME='event_2';
 IF(TIME_TO_SEC(TIMEDIFF(ENDS,STARTS))=6, 'OK', 'ERROR')
 OK
-SELECT IF(LAST_EXECUTED-ENDS <= 0, 'OK', 'ERROR')
-FROM INFORMATION_SCHEMA.EVENTS
-WHERE EVENT_SCHEMA=DATABASE() AND EVENT_NAME='event_2';
-IF(LAST_EXECUTED-ENDS <= 0, 'OK', 'ERROR')
-OK
 "Already dropped because ended. Therefore an error."
 DROP EVENT event_3;
 ERROR HY000: Unknown event 'event_3'

mysql-test/suite/binlog/r/binlog_base64_flag.result

@@ -40,8 +40,13 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
 SET @@session.sql_mode=0/*!*/;
 /*!\C latin1 *//*!*/;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-create table t1 (a int) engine= myisam/*!*/;
+create table t1 (a int) engine= myisam
+/*!*/;
 # at 203
+DELIMITER ;
+# End of log file
+ROLLBACK /* added by mysqlbinlog */;
+/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 ==== Test non-matching FD event and Row event ====
 BINLOG '
 4CdYRw8BAAAAYgAAAGYAAAAAAAQANS4xLjE1LW5kYi02LjEuMjQtZGVidWctbG9nAAAAAAAAAAAA

mysql-test/suite/binlog/r/binlog_old_versions.result

@@ -29,6 +29,16 @@ SELECT COUNT(*) FROM t3;
 COUNT(*)
 17920
 DROP TABLE t1, t2, t3;
+==== Read binlog from version 4.1 ====
+SELECT * FROM t1 ORDER BY a;
+a	b
+0	last_insert_id
+4	four
+190243	random
+SELECT COUNT(*) FROM t3;
+COUNT(*)
+17920
+DROP TABLE t1, t3;
 ==== Read binlog from alcatel tree (mysql-5.1-wl2325-5.0-drop6) ====
 SELECT * FROM t1 ORDER BY a;
 a	b

mysql-test/suite/binlog/t/binlog_base64_flag.test

@@ -6,6 +6,10 @@
 # See also BUG#32407.
 
 
+# BINLOG statement does not work in embedded mode.
+source include/not_embedded.inc;
+
+
 # Test to show BUG#32407.  This reads a binlog created with the
 # mysql-5.1-telco-6.1 tree, specifically at the tag
 # mysql-5.1.15-ndb-6.1.23, and applies it to the database.  The test
@@ -15,7 +19,7 @@
 # The binlog contains row events equivalent to:
 # CREATE TABLE t1 (a int) engine = myisam
 # INSERT INTO t1 VALUES (1), (1)
-exec $MYSQL_BINLOG suite/binlog/std_data/binlog-bug32407.000001 | $MYSQL;
+exec $MYSQL_BINLOG suite/binlog/std_data/bug32407.001 | $MYSQL;
 # The above line should succeed and t1 should contain two ones
 select * from t1;
 
@@ -68,7 +72,7 @@ select * from t1;
 # mysqlbinlog should fail
 --replace_regex /#[0-9][0-9][0-9][0-9][0-9][0-9] .*/#/
 error 1;
-exec $MYSQL_BINLOG --base64-output=never suite/binlog/std_data/binlog-bug32407.000001;
+exec $MYSQL_BINLOG --base64-output=never suite/binlog/std_data/bug32407.001;
 # the above line should output the query log event and then stop
 
 
@@ -78,7 +82,7 @@ exec $MYSQL_BINLOG --base64-output=never suite/binlog/std_data/binlog-bug32407.0
 --echo ==== Test non-matching FD event and Row event ====
 
 # This is the Format_description_log_event from
-# binlog-bug32407.000001, encoded in base64. It contains only the old
+# bug32407.001, encoded in base64. It contains only the old
 # row events (number of event types is 22)
 BINLOG '
 4CdYRw8BAAAAYgAAAGYAAAAAAAQANS4xLjE1LW5kYi02LjEuMjQtZGVidWctbG9nAAAAAAAAAAAA

mysql-test/suite/binlog/t/binlog_killed.test

@@ -39,7 +39,7 @@ connection con2;
 reap;
 let $rows= `select count(*) from t2  /* must be 2 or 0 */`;
 
---exec $MYSQL_BINLOG --start-position=134 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog
+--exec $MYSQL_BINLOG --force-if-open --start-position=134 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 eval select
 (@a:=load_file("$MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog"))
@@ -250,7 +250,7 @@ source include/show_binlog_events.inc;
 
 # a proof the query is binlogged with an error
 
---exec $MYSQL_BINLOG --start-position=106 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
+--exec $MYSQL_BINLOG --force-if-open --start-position=106 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 eval select
 (@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
@@ -296,7 +296,7 @@ source include/show_binlog_events.inc;
 
 # a proof the query is binlogged with an error
 
---exec $MYSQL_BINLOG --start-position=106 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
+--exec $MYSQL_BINLOG --force-if-open --start-position=106 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 eval select
 (@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))

mysql-test/suite/binlog/t/binlog_killed_simulate.test

@@ -23,7 +23,7 @@ update t1 set a=2 /* will be "killed" after work has been done */;
 #todo: introduce a suite private macro that provides numeric values
 #      for some constants like the offset of the first real event
 #      that is different between severs versions.
---exec $MYSQL_BINLOG --start-position=106 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
+--exec $MYSQL_BINLOG --force-if-open --start-position=106 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 eval select
 (@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))
@@ -51,7 +51,7 @@ load data infile '../std_data_ln/rpl_loaddata.dat' into table t2 /* will be "kil
 
 source include/show_binlog_events.inc;
 
---exec $MYSQL_BINLOG --start-position=98 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
+--exec $MYSQL_BINLOG --force-if-open --start-position=98 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 eval select
 (@a:=load_file("$MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))

mysql-test/suite/binlog/t/binlog_old_versions.test

@@ -31,7 +31,7 @@ DROP TABLE IF EXISTS t1, t2, t3;
 --echo ==== Read modern binlog (version 5.1.23) ====
 
 # Read binlog.
---exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/ suite/binlog/std_data/binlog_old_version_5_1_23.000001 | $MYSQL --local-infile=1
+--exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/ suite/binlog/std_data/ver_5_1_23.001 | $MYSQL --local-infile=1
 # Show result.
 SELECT * FROM t1 ORDER BY a;
 SELECT * FROM t2 ORDER BY a;
@@ -43,7 +43,7 @@ DROP TABLE t1, t2, t3;
 --echo ==== Read binlog from version 5.1.17 ====
 
 # Read binlog.
---exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/ suite/binlog/std_data/binlog_old_version_5_1_17.000001 | $MYSQL --local-infile=1
+--exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/ suite/binlog/std_data/ver_5_1_17.001 | $MYSQL --local-infile=1
 # Show result.
 SELECT * FROM t1 ORDER BY a;
 SELECT * FROM t2 ORDER BY a;
@@ -52,6 +52,21 @@ SELECT COUNT(*) FROM t3;
 DROP TABLE t1, t2, t3;
 
 
+--echo ==== Read binlog from version 4.1 ====
+
+# In this version, neither row-based binlogging nor Xid events
+# existed, so the binlog was generated without the "row-based tests"
+# part and the "get xid event" part, and it does not create table t2.
+
+# Read binlog.
+--exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/ suite/binlog/std_data/binlog_old_version_4_1.000001 | $MYSQL --local-infile=1
+# Show result.
+SELECT * FROM t1 ORDER BY a;
+SELECT COUNT(*) FROM t3;
+# Reset.
+DROP TABLE t1, t3;
+
+
 --echo ==== Read binlog from alcatel tree (mysql-5.1-wl2325-5.0-drop6) ====
 
 # In this version, it was not possible to switch between row-based and
@@ -60,9 +75,9 @@ DROP TABLE t1, t2, t3;
 # replication.
 
 # Read rbr binlog.
---exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/ suite/binlog/std_data/binlog_old_version_5_1-wl2325_row.000001 | $MYSQL --local-infile=1
+--exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/ suite/binlog/std_data/ver_5_1-wl2325_r.001 | $MYSQL --local-infile=1
 # Read stm binlog.
---exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/ suite/binlog/std_data/binlog_old_version_5_1-wl2325_stm.000001 | $MYSQL --local-infile=1
+--exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/ suite/binlog/std_data/ver_5_1-wl2325_s.001 | $MYSQL --local-infile=1
 # Show result.
 SELECT * FROM t1 ORDER BY a;
 SELECT * FROM t2 ORDER BY a;
@@ -74,7 +89,7 @@ DROP TABLE t1, t2, t3;
 --echo ==== Read binlog from ndb tree (mysql-5.1-telco-6.1) ====
 
 # Read binlog.
---exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/ suite/binlog/std_data/binlog_old_version_5_1-telco.000001 | $MYSQL --local-infile=1
+--exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/ suite/binlog/std_data/ver_5_1-telco.001 | $MYSQL --local-infile=1
 # Show resulting tablea.
 SELECT * FROM t1 ORDER BY a;
 SELECT * FROM t2 ORDER BY a;

mysql-test/suite/binlog/t/disabled.def

@@ -10,4 +10,3 @@
 #
 ##############################################################################
 binlog_multi_engine      : Bug#32663 binlog_multi_engine.test fails randomly
-binlog_base64_flag : BUG#33247 2007-12-14 Sven: mysqlbinlog does not clean up after itself on termination. When compiled in debug mode, this test generates lots of warnings for memory leaks.

mysql-test/suite/bugs/data/rpl_bug12691.dat

+a
+b
+c

mysql-test/suite/bugs/r/rpl_bug12691.result

+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+
+**** On Master ****
+CREATE TABLE t1 (b CHAR(10));
+
+**** On Slave ****
+STOP SLAVE;
+
+**** On Master ****
+LOAD DATA INFILE FILENAME
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+3
+SHOW BINLOG EVENTS;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Format_desc	1	#	Server ver: #
+master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE t1 (b CHAR(10))
+master-bin.000001	#	Begin_load_query	1	#	;file_id=#;block_len=#
+master-bin.000001	#	Execute_load_query	1	#	use `test`; LOAD DATA INFILE FILENAME ;file_id=#
+
+**** On Slave ****
+SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
+START SLAVE;
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+0
+
+**** On Master ****
+DROP TABLE t1;

mysql-test/suite/bugs/t/rpl_bug12691.test

+# Bug#12691: Exec_master_log_pos corrupted with SQL_SLAVE_SKIP_COUNTER
+# Date: 01/31/2008
+# Added: Serge Kozlov <skozlov@mysql.com>
+
+--source include/master-slave.inc
+--connection master
+--source include/have_binlog_format_mixed_or_statement.inc
+
+--echo
+--echo **** On Master ****
+CREATE TABLE t1 (b CHAR(10));
+--echo
+--echo **** On Slave ****
+--sync_slave_with_master
+STOP SLAVE;
+--source include/wait_for_slave_to_stop.inc
+
+--connection master
+
+--echo
+--echo **** On Master ****
+--exec cp $MYSQL_TEST_DIR/suite/bugs/data/rpl_bug12691.dat $MYSQLTEST_VARDIR/tmp/
+--echo LOAD DATA INFILE FILENAME
+--disable_query_log
+--eval LOAD DATA INFILE '$MYSQLTEST_VARDIR/tmp/rpl_bug12691.dat' INTO TABLE t1 FIELDS TERMINATED BY '|'
+--enable_query_log
+--remove_file $MYSQLTEST_VARDIR/tmp/rpl_bug12691.dat
+
+SELECT COUNT(*) FROM t1;
+
+--replace_column 2 # 5 #
+--replace_regex /Server ver: .+/Server ver: #/ /table_id: [0-9]+/table_id: #/ /COMMIT.+xid=[0-9]+.+/#/ /file_id=[0-9]+/file_id=#/ /block_len=[0-9]+/block_len=#/ /'.+'/FILENAME/
+SHOW BINLOG EVENTS;
+
+--save_master_pos
+
+--connection slave
+--echo
+--echo **** On Slave ****
+SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
+START SLAVE;
+--source include/wait_for_slave_to_start.inc
+--sync_with_master
+
+SELECT COUNT(*) FROM t1;
+
+# Clean up
+--connection master
+--echo
+--echo **** On Master ****
+DROP TABLE t1;
+--sync_slave_with_master
+

mysql-test/suite/ndb/r/ndb_auto_increment.result

@@ -421,10 +421,10 @@ select * from t1 order by a;
 a
 1
 20
-21
 33
 34
 35
+65
 insert into t1 values (100);
 insert into t1 values (NULL);
 insert into t1 values (NULL);
@@ -432,11 +432,11 @@ select * from t1 order by a;
 a
 1
 20
-21
-22
 33
 34
 35
+65
+66
 100
 101
 set auto_increment_offset = @old_auto_increment_offset;

mysql-test/suite/ndb/r/ndb_autoinc.result

+DROP TABLE IF EXISTS t1,t2,t3;
+USE test;
+CREATE TABLE t1 (
+id INT AUTO_INCREMENT,
+PRIMARY KEY(id)
+) ENGINE=NDBCLUSTER;
+CREATE TABLE t2 (
+id INT AUTO_INCREMENT,
+KEY(id)
+) ENGINE=NDBCLUSTER;
+ERROR HY000: Can't create table 'test.t2' (errno: 4335)
+SHOW TABLES;
+Tables_in_test
+t1
+CREATE TABLE t3 (
+id INT AUTO_INCREMENT,
+KEY(id)
+) ENGINE=MYISAM;
+ALTER TABLE t3
+ENGINE NDBCLUSTER;
+SHOW CREATE TABLE t3;
+Table	Create Table
+t3	CREATE TABLE `t3` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  KEY `id` (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+ALTER TABLE t3
+ADD PRIMARY KEY (id);
+SHOW CREATE TABLE t3;
+Table	Create Table
+t3	CREATE TABLE `t3` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  PRIMARY KEY (`id`),
+  KEY `id` (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE t1, t3;
+End of 5.1 tests

mysql-test/suite/ndb/r/ndb_bug31477.result

+drop table if exists t1;
+create table t1(a int primary key, b int, c int, unique(b)) engine = ndb;
+insert into t1 values (2,2,2);
+insert into t1 values (3,3,3);
+insert into t1 values (4,4,4);
+begin;
+insert into t1 values (1,1,1);
+begin;
+update t1 set c = 2 where b = 1;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+rollback;
+rollback;
+drop table t1;
+create table t1(a int primary key, b int, c int, key(b)) engine = ndb;
+insert into t1 values (2,2,2);
+insert into t1 values (3,3,3);
+insert into t1 values (4,4,4);
+begin;
+insert into t1 values (1,1,1);
+begin;
+update t1 set c = 2 where b = 1;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+rollback;
+rollback;
+drop table t1;
+--con1
+create table t1(a int primary key, b int, c int, key(b)) engine = ndb;
+insert into t1 values (1,1,1);
+insert into t1 values (2,2,2);
+insert into t1 values (3,3,3);
+insert into t1 values (4,4,4);
+begin;
+update t1 set c = 10 where a = 1;
+update t1 set c = 20 where a = 1;
+update t1 set c = 30 where a = 1;
+--con1 c=30
+select * from t1 where b >= 1 order by b;
+a	b	c
+1	1	30
+2	2	2
+3	3	3
+4	4	4
+--con2 c=1
+select * from t1 where b >= 1 order by b;
+a	b	c
+1	1	1
+2	2	2
+3	3	3
+4	4	4
+--con1
+delete from t1 where a = 1;
+--con1 c=none
+select * from t1 where b >= 1 order by b;
+a	b	c
+2	2	2
+3	3	3
+4	4	4
+--con2 c=1
+select * from t1 where b >= 1 order by b;
+a	b	c
+1	1	1
+2	2	2
+3	3	3
+4	4	4
+--con1
+commit;
+--con1 c=none
+select * from t1 where b >= 1 order by b;
+a	b	c
+2	2	2
+3	3	3
+4	4	4
+--con2 c=none
+select * from t1 where b >= 1 order by b;
+a	b	c
+2	2	2
+3	3	3
+4	4	4
+--con1
+begin;
+insert into t1 values (1,1,1);
+update t1 set c = 10 where a = 1;
+update t1 set c = 20 where a = 1;
+update t1 set c = 30 where a = 1;
+--con1 c=30
+select * from t1 where b >= 1 order by b;
+a	b	c
+1	1	30
+2	2	2
+3	3	3
+4	4	4
+--con2 c=none
+select * from t1 where b >= 1 order by b;
+a	b	c
+2	2	2
+3	3	3
+4	4	4
+drop table t1;

mysql-test/suite/ndb/r/ndb_condition_pushdown.result

@@ -1904,6 +1904,12 @@ a	b	d
 10	1	4369
 20	2	8738
 50	5	21845
+-- big filter just below limit
+a	b	d
+10	1	4369
+20	2	8738
+50	5	21845
+-- big filter just above limit
 a	b	d
 10	1	4369
 20	2	8738

mysql-test/suite/ndb/r/ndb_dd_basic.result

@@ -406,6 +406,16 @@ a	b	c
 1	7	7
 2	2	2
 3	3	3
+DELETE FROM t1;
+INSERT INTO t1 VALUES (3,'1','1');
+BEGIN;
+UPDATE t1 SET b = b + 2 WHERE A = 3;
+DELETE FROM t1 WHERE A = 3;
+INSERT INTO t1 VALUES (3,'0','0');
+COMMIT;
+SELECT * from t1 ORDER BY 1;
+a	b	c
+3	0	0
 DROP TABLE t1;
 CREATE TABLE t1 (
 a INT NOT NULL PRIMARY KEY,
@@ -501,6 +511,18 @@ f1	f2
 111111	aaaaaa
 222222	bbbbbb
 drop table test.t1;
+CREATE TABLE t1 (
+id int unsigned NOT NULL,
+c1 int unsigned NOT NULL,
+c2 int DEFAULT NULL,
+PRIMARY KEY using hash (id),
+UNIQUE KEY c1 using hash (c1))
+TABLESPACE ts1 STORAGE DISK ENGINE=ndbcluster;
+insert into t1 values(1, 1, 3);
+insert into t1 values(2, 2, 3);
+update t1 set c1 = 1 where id = 2;
+ERROR 23000: Duplicate entry '1' for key 'c1'
+drop table t1;
 ALTER TABLESPACE ts1 
 DROP DATAFILE 'datafile.dat' 
 ENGINE = NDB;

mysql-test/suite/ndb/r/ndb_partition_key.result

@@ -38,6 +38,23 @@ a	b	c
 1	10	3
 1	11	3
 1	12	3
+select max(b) from t1 where a = 1;
+max(b)
+12
+select b from t1 where a = 1 order by b desc;
+b
+12
+11
+10
+9
+8
+7
+6
+5
+4
+3
+2
+1
 DROP TABLE t1;
 CREATE TABLE t1 (a INT, b CHAR(10) COLLATE latin1_bin, c INT, d INT,
 PRIMARY KEY (a,b,c) USING HASH)

mysql-test/suite/ndb/r/ndb_partition_range.result

@@ -46,6 +46,14 @@ a	b	c
 1	1	1
 6	1	1
 10	1	1
+INSERT into t1 values (1, 2, 2);
+select max(b) from t1 where a = 1;
+max(b)
+2
+select b from t1 where a = 1 order by b desc;
+b
+2
+1
 drop table t1;
 CREATE TABLE t1 (
 a int not null,

mysql-test/suite/ndb/r/ndb_restore.result

@@ -253,21 +253,41 @@ a
 2000
 3000
 10000
-show table status like 't1_c';
-Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-X	X	X	X	X	X	X	X	X	X	3001	X	X	X	X	X	X	X
-show table status like 't2_c';
-Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-X	X	X	X	X	X	X	X	X	X	501	X	X	X	X	X	X	X
-show table status like 't4_c';
-Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-X	X	X	X	X	X	X	X	X	X	290000001	X	X	X	X	X	X	X
-show table status like 't7_c';
-Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-X	X	X	X	X	X	X	X	X	X	29	X	X	X	X	X	X	X
-show table status like 't10_c';
-Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-X	X	X	X	X	X	X	X	X	X	10001	X	X	X	X	X	X	X
+select max(capgoaledatta) from t1_c;
+max(capgoaledatta)
+3000
+select auto_increment from information_schema.tables
+where table_name = 't1_c';
+auto_increment
+3001
+select max(capgotod) from t2_c;
+max(capgotod)
+500
+select auto_increment from information_schema.tables
+where table_name = 't2_c';
+auto_increment
+501
+select max(capfa) from t4_c;
+max(capfa)
+290000000
+select auto_increment from information_schema.tables
+where table_name = 't4_c';
+auto_increment
+290000001
+select max(dardtestard) from t7_c;
+max(dardtestard)
+28
+select auto_increment from information_schema.tables
+where table_name = 't7_c';
+auto_increment
+29
+select max(a) from t10_c;
+max(a)
+10000
+select auto_increment from information_schema.tables
+where table_name = 't10_c';
+auto_increment
+10001
 ALTER TABLE t7_c
 PARTITION BY LINEAR KEY (`dardtestard`);
 CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP;

mysql-test/suite/ndb/t/ndb_autoinc.test

+-- source include/have_ndb.inc
+-- source include/not_embedded.inc
+
+--disable_warnings
+DROP TABLE IF EXISTS t1,t2,t3;
+--enable_warnings
+
+USE test;
+
+CREATE TABLE t1 (
+  id INT AUTO_INCREMENT,
+  PRIMARY KEY(id)
+) ENGINE=NDBCLUSTER;
+
+# Test For bug#30417
+--error 1005
+
+CREATE TABLE t2 (
+  id INT AUTO_INCREMENT,
+  KEY(id)
+) ENGINE=NDBCLUSTER;
+
+SHOW TABLES;
+
+CREATE TABLE t3 (
+  id INT AUTO_INCREMENT,
+  KEY(id)
+) ENGINE=MYISAM;
+
+--disable_result_log
+--error 1005
+ALTER TABLE t3
+ENGINE NDBCLUSTER;
+--enable_result_log
+
+SHOW CREATE TABLE t3;
+
+ALTER TABLE t3
+ADD PRIMARY KEY (id);
+
+SHOW CREATE TABLE t3;
+
+DROP TABLE t1, t3;
+
+--echo End of 5.1 tests

mysql-test/suite/ndb/t/ndb_bug31477.test

+--source include/have_ndb.inc
+
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
+# setup
+
+connect (con1,localhost,root,,test);
+connect (con2,localhost,root,,test);
+
+# unique index
+connection con1;
+create table t1(a int primary key, b int, c int, unique(b)) engine = ndb;
+insert into t1 values (2,2,2);
+insert into t1 values (3,3,3);
+insert into t1 values (4,4,4);
+
+begin;
+insert into t1 values (1,1,1);
+
+connection con2;
+begin;
+--error 1205
+update t1 set c = 2 where b = 1;
+rollback;
+
+connection con1;
+rollback;
+drop table t1;
+# ordered index
+
+connection con1;
+create table t1(a int primary key, b int, c int, key(b)) engine = ndb;
+insert into t1 values (2,2,2);
+insert into t1 values (3,3,3);
+insert into t1 values (4,4,4);
+
+begin;
+insert into t1 values (1,1,1);
+
+connection con2;
+begin;
+--error 1205
+update t1 set c = 2 where b = 1;
+rollback;
+
+connection con1;
+rollback;
+drop table t1;
+
+# multiple versions
+
+--echo --con1
+connection con1;
+create table t1(a int primary key, b int, c int, key(b)) engine = ndb;
+insert into t1 values (1,1,1);
+insert into t1 values (2,2,2);
+insert into t1 values (3,3,3);
+insert into t1 values (4,4,4);
+
+begin;
+update t1 set c = 10 where a = 1;
+update t1 set c = 20 where a = 1;
+update t1 set c = 30 where a = 1;
+
+--echo --con1 c=30
+select * from t1 where b >= 1 order by b;
+--echo --con2 c=1
+connection con2;
+select * from t1 where b >= 1 order by b;
+
+--echo --con1
+connection con1;
+delete from t1 where a = 1;
+
+--echo --con1 c=none
+select * from t1 where b >= 1 order by b;
+--echo --con2 c=1
+connection con2;
+select * from t1 where b >= 1 order by b;
+
+--echo --con1
+connection con1;
+commit;
+
+--echo --con1 c=none
+select * from t1 where b >= 1 order by b;
+--echo --con2 c=none
+connection con2;
+select * from t1 where b >= 1 order by b;
+
+--echo --con1
+connection con1;
+begin;
+insert into t1 values (1,1,1);
+update t1 set c = 10 where a = 1;
+update t1 set c = 20 where a = 1;
+update t1 set c = 30 where a = 1;
+
+--echo --con1 c=30
+select * from t1 where b >= 1 order by b;
+--echo --con2 c=none
+connection con2;
+select * from t1 where b >= 1 order by b;
+
+# this fails with "no such table" via con2 ???
+connection con1;
+drop table t1;

mysql-test/suite/ndb/t/ndb_dd_basic.test

@@ -346,6 +346,16 @@ UPDATE t1 SET c = '6' WHERE b = '7';
 SELECT * FROM t1 ORDER BY 1;
 UPDATE t1 SET c = '7' WHERE c = '6';
 SELECT * FROM t1 ORDER BY 1;
+
+DELETE FROM t1;
+INSERT INTO t1 VALUES (3,'1','1');
+BEGIN;
+UPDATE t1 SET b = b + 2 WHERE A = 3;
+DELETE FROM t1 WHERE A = 3;
+INSERT INTO t1 VALUES (3,'0','0');
+COMMIT;
+SELECT * from t1 ORDER BY 1;
+
 DROP TABLE t1;
 
 ########################
@@ -439,6 +449,21 @@ select f2 from test.t1 order by f2;
 select f1,f2 from test.t1 order by f1;
 drop table test.t1;
 
+# bug#34118 hash index trigger and do not update any disk attr
+CREATE TABLE t1 (
+id int unsigned NOT NULL,
+c1 int unsigned NOT NULL,
+c2 int DEFAULT NULL,
+PRIMARY KEY using hash (id),
+UNIQUE KEY c1 using hash (c1))
+TABLESPACE ts1 STORAGE DISK ENGINE=ndbcluster;
+
+insert into t1 values(1, 1, 3);
+insert into t1 values(2, 2, 3);
+--error ER_DUP_ENTRY
+update t1 set c1 = 1 where id = 2;
+drop table t1;
+
 ###################
 # Test Cleanup
 ###################

mysql-test/suite/ndb/t/ndb_partition_key.test

@@ -38,6 +38,10 @@ insert into t1 values
 
 select * from t1 order by b;
 
+# BUG#33061: ORDER BY DESC becomes ASC in NDB partition pruning to one partition
+select max(b) from t1 where a = 1;
+select b from t1 where a = 1 order by b desc;
+
 DROP TABLE t1;
 
 #

mysql-test/suite/ndb/t/ndb_partition_range.test

@@ -48,6 +48,11 @@ select * from t1 where a=21 order by a;
 select * from t1 where a in (1,6,10,21) order by a;
 select * from t1 where b=1 and a in (1,6,10,21) order by a;
 
+# BUG#33061: ORDER BY DESC becomes ASC in NDB partition pruning to one partition
+INSERT into t1 values (1, 2, 2);
+select max(b) from t1 where a = 1;
+select b from t1 where a = 1 order by b desc;
+
 drop table t1;
 
 #

mysql-test/suite/ndb/t/ndb_restore.test

@@ -246,16 +246,21 @@ select count(*)
 select * from t10_c order by a;
 # Bug #27775 cont'd
 # - auto inc info should be correct
---replace_column 1 X 2 X 3 X 4 X 5 X 6 X 7 X 8 X 9 X 10 X 12 X 13 X 14 X 15 X 16 X 17 X 18 X
-show table status like 't1_c';
---replace_column 1 X 2 X 3 X 4 X 5 X 6 X 7 X 8 X 9 X 10 X 12 X 13 X 14 X 15 X 16 X 17 X 18 X
-show table status like 't2_c'; 
---replace_column 1 X 2 X 3 X 4 X 5 X 6 X 7 X 8 X 9 X 10 X 12 X 13 X 14 X 15 X 16 X 17 X 18 X
-show table status like 't4_c'; 
---replace_column 1 X 2 X 3 X 4 X 5 X 6 X 7 X 8 X 9 X 10 X 12 X 13 X 14 X 15 X 16 X 17 X 18 X
-show table status like 't7_c'; 
---replace_column 1 X 2 X 3 X 4 X 5 X 6 X 7 X 8 X 9 X 10 X 12 X 13 X 14 X 15 X 16 X 17 X 18 X
-show table status like 't10_c';
+select max(capgoaledatta) from t1_c;
+select auto_increment from information_schema.tables
+where table_name = 't1_c';
+select max(capgotod) from t2_c;
+select auto_increment from information_schema.tables
+where table_name = 't2_c';
+select max(capfa) from t4_c;
+select auto_increment from information_schema.tables
+where table_name = 't4_c';
+select max(dardtestard) from t7_c;
+select auto_increment from information_schema.tables
+where table_name = 't7_c';
+select max(a) from t10_c;
+select auto_increment from information_schema.tables
+where table_name = 't10_c';
 
 #
 # Try Partitioned tables as well

mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result → mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result

@@ -440,23 +440,21 @@ f1	f2	f3	f4
 select * from t4 order by f1;
 f1	f2	f3	f4
 1	1	1	first
-select * from t31 order by f1;
+select * from t31 order by f3;
 f1	f2	f3	f4
-1	1	5	fifth
-1	1	3	third
 1	1	1	first
-1	1	6	sixth
 1	1	2	second
+1	1	3	third
 1	1	4	fourth
+1	1	5	fifth
+1	1	6	sixth
 
 ** Do updates master **
 
 update t31 set f5=555555555555555 where f3=6;
 update t31 set f2=2 where f3=2;
 update t31 set f1=NULL where f3=1;
-update t31 set f3=NULL, f27=NULL, f35='f35 new value' where f3=3;
-Warnings:
-Warning	1048	Column 'f3' cannot be null
+update t31 set f3=0, f27=NULL, f35='f35 new value' where f3=3;
 
 ** Delete from Master **
 
@@ -563,7 +561,7 @@ Replicate_Do_Table
 Replicate_Ignore_Table	
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1534
+Last_Errno	1535
 Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -581,7 +579,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	#
 Last_IO_Error	#
-Last_SQL_Errno	1534
+Last_SQL_Errno	1535
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -638,7 +636,7 @@ Replicate_Do_Table
 Replicate_Ignore_Table	
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1534
+Last_Errno	1535
 Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -656,7 +654,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	#
 Last_IO_Error	#
-Last_SQL_Errno	1534
+Last_SQL_Errno	1535
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -1581,23 +1579,21 @@ f1	f2	f3	f4
 select * from t4 order by f1;
 f1	f2	f3	f4
 1	1	1	first
-select * from t31 order by f1;
+select * from t31 order by f3;
 f1	f2	f3	f4
-1	1	5	fifth
-1	1	3	third
 1	1	1	first
-1	1	6	sixth
 1	1	2	second
+1	1	3	third
 1	1	4	fourth
+1	1	5	fifth
+1	1	6	sixth
 
 ** Do updates master **
 
 update t31 set f5=555555555555555 where f3=6;
 update t31 set f2=2 where f3=2;
 update t31 set f1=NULL where f3=1;
-update t31 set f3=NULL, f27=NULL, f35='f35 new value' where f3=3;
-Warnings:
-Warning	1048	Column 'f3' cannot be null
+update t31 set f3=0, f27=NULL, f35='f35 new value' where f3=3;
 
 ** Delete from Master **
 
@@ -1704,7 +1700,7 @@ Replicate_Do_Table
 Replicate_Ignore_Table	
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1534
+Last_Errno	1535
 Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -1722,7 +1718,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	#
 Last_IO_Error	#
-Last_SQL_Errno	1534
+Last_SQL_Errno	1535
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;
@@ -1779,7 +1775,7 @@ Replicate_Do_Table
 Replicate_Ignore_Table	
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1534
+Last_Errno	1535
 Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -1797,7 +1793,7 @@ Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
 Last_IO_Errno	#
 Last_IO_Error	#
-Last_SQL_Errno	1534
+Last_SQL_Errno	1535
 Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
 START SLAVE;

mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_innodb.result → mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result

@@ -20,13 +20,27 @@ from mysql.ndb_apply_status;
 @log_name:=log_name	@start_pos:=start_pos	@end_pos:=end_pos
 <log_name>	<start_pos>	<end_pos>
 
+# Now check that that is in the apply_status table is consistant
+# with what is in the binlog
+
+# since insert is done with transactional engine, expect a BEGIN
+# at <start_pos>
+
 show binlog events from <start_pos> limit 1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	<start_pos>	Query	1	#	use `test`; insert into t1 values (1,2)
+master-bin.000001	<start_pos>	Query	1	#	use `test`; BEGIN
+
+# Now the insert, one step after
 
 show binlog events from <start_pos> limit 1,1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Xid	1	445	COMMIT /* XID */
+master-bin.000001	#	Query	1	#	use `test`; insert into t1 values (1,2)
+
+# and the COMMIT should be at <end_pos>
+
+show binlog events from <start_pos> limit 2,1;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Xid	1	<end_pos>	COMMIT /* XID */
 
 begin;
 insert into t1 values (2,3);

mysql-test/suite/ndb_team/t/disabled.def

@@ -15,3 +15,6 @@ ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
 #ndb_autodiscover3        : bug#21806
 #ndb_autodiscover3         : Bug#20872 2007-07-15 ingo master*.err: miscellaneous error messages
+#rpl_ndb_extraColMaster   : BUG#30854 : Tables name show as binary in slave err msg on vm-win2003-64-b and Solaris
+#rpl_ndb_mix_innodb       : Bug #32720   Test rpl_ndb_mix_innodb fails on SPARC and PowerPC
+#rpl_ndb_dd_advance	 : Bug #30222  	rpl_ndb_dd_advance.test fails

mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result → mysql-test/suite/rpl/r/rpl_charset.result

@@ -40,14 +40,13 @@ show create database mysqltest3;
 Database	Create Database
 mysqltest3	CREATE DATABASE `mysqltest3` /*!40100 DEFAULT CHARACTER SET armscii8 COLLATE armscii8_bin */
 use mysqltest2;
-create table t1 (a int auto_increment primary key, b varchar(100))engine=NDB;;
+create table t1 (a int auto_increment primary key, b varchar(100));
 set character_set_client=cp850, collation_connection=latin2_croatian_ci;
 insert into t1 (b) values(@@character_set_server);
 insert into t1 (b) values(@@collation_server);
 insert into t1 (b) values(@@character_set_client);
 insert into t1 (b) values(@@character_set_connection);
 insert into t1 (b) values(@@collation_connection);
-
 --- --master--
 select * from t1 order by a;
 a	b
@@ -56,7 +55,6 @@ a	b
 3	cp850
 4	latin2
 5	latin2_croatian_ci
-
 --- --slave--
 select * from mysqltest2.t1 order by a;
 a	b
@@ -65,9 +63,6 @@ a	b
 3	cp850
 4	latin2
 5	latin2_croatian_ci
-select "--- --muller--" as "";
-
---- --muller--
 set character_set_client=latin1, collation_connection=latin1_german1_ci;
 truncate table t1;
 insert into t1 (b) values(@@collation_connection);
@@ -75,7 +70,6 @@ insert into t1 (b) values(LEAST("M
 set collation_connection=latin1_german2_ci;
 insert into t1 (b) values(@@collation_connection);
 insert into t1 (b) values(LEAST("Mller","Muffler"));
-
 --- --master--
 select * from t1 order by a;
 a	b
@@ -83,7 +77,6 @@ a	b
 2	Muffler
 3	latin1_german2_ci
 4	Mller
-
 --- --slave--
 select * from mysqltest2.t1 order by a;
 a	b
@@ -91,65 +84,23 @@ a	b
 2	Muffler
 3	latin1_german2_ci
 4	Mller
-select "--- --INSERT--" as "";
-
---- --INSERT--
 set @a= _cp850 'Mller' collate cp850_general_ci;
 truncate table t1;
 insert into t1 (b) values(collation(@a));
-
 --- --master--
 select * from t1 order by a;
 a	b
 1	cp850_general_ci
-
 --- --slave--
 select * from mysqltest2.t1 order by a;
 a	b
 1	cp850_general_ci
 drop database mysqltest2;
 drop database mysqltest3;
-show binlog events from <binlog_start>;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	drop database if exists mysqltest2
-master-bin.000001	#	Query	#	#	drop database if exists mysqltest3
-master-bin.000001	#	Query	#	#	create database mysqltest2 character set latin2
-master-bin.000001	#	Query	#	#	create database mysqltest3
-master-bin.000001	#	Query	#	#	drop database mysqltest3
-master-bin.000001	#	Query	#	#	create database mysqltest3
-master-bin.000001	#	Query	#	#	use `mysqltest2`; create table t1 (a int auto_increment primary key, b varchar(100))engine=NDB
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Table_map	#	#	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	#	Write_rows	#	#	table_id: #
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	use `mysqltest2`; truncate table t1
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Table_map	#	#	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	#	Write_rows	#	#	table_id: #
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	use `mysqltest2`; truncate table t1
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Table_map	#	#	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	#	Write_rows	#	#	table_id: #
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	drop database mysqltest2
-master-bin.000001	#	Query	#	#	drop database mysqltest3
-select "--- --global--" as "";
-
---- --global--
 set global character_set_server=latin2;
 set global character_set_server=latin1;
 set global character_set_server=latin2;
 set global character_set_server=latin1;
-select "--- --oneshot--" as "";
-
---- --oneshot--
 set one_shot @@character_set_server=latin5;
 set @@max_join_size=1000;
 select @@character_set_server;
@@ -171,31 +122,23 @@ set character_set_client=9999999;
 ERROR 42000: Unknown character set: '9999999'
 set collation_server=9999998;
 ERROR HY000: Unknown collation: '9999998'
-select "--- --3943--" as "";
-
---- --3943--
 use test;
-CREATE TABLE t1 (c1 VARBINARY(255), c2 VARBINARY(255))ENGINE=NDB;;
+CREATE TABLE t1 (c1 VARBINARY(255), c2 VARBINARY(255));
 SET CHARACTER_SET_CLIENT=koi8r,
 CHARACTER_SET_CONNECTION=cp1251, 
 CHARACTER_SET_RESULTS=koi8r;
 INSERT INTO t1 (c1, c2) VALUES (',  ',',  ');
-SET SQL_BIG_SELECTS=1;
 select hex(c1), hex(c2) from t1;
 hex(c1)	hex(c2)
 CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3
-SET SQL_BIG_SELECTS=1;
 select hex(c1), hex(c2) from t1;
 hex(c1)	hex(c2)
 CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3
 drop table t1;
-select "--- --6676--" as "";
-
---- --6676--
 create table `t1` (
 `pk` varchar(10) not null default '', 
 primary key (`pk`)
-) engine=NDB default charset=latin1;
+) engine=myisam default charset=latin1;
 set @p=_latin1 'test';
 update t1 set pk='test' where pk=@p;
 drop table t1;

mysql-test/suite/rpl/r/rpl_events.result

@@ -195,9 +195,11 @@ test	slave_terminate	SLAVESIDE_DISABLED	2
 DROP EVENT test.slave_terminate;
 "Cleanup"
 DROP TABLE t1;
+CREATE TABLE t28953 (a INT);
 CREATE EVENT event1 ON SCHEDULE EVERY 1 YEAR
 DO BEGIN
-select * from t1;
+select * from t28953;
 END;|
 ALTER EVENT event1 RENAME TO event2;
 DROP EVENT event2;
+DROP TABLE t28953;

mysql-test/suite/rpl/r/rpl_loaddata_map.result

@@ -12,13 +12,13 @@ load data infile 'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2;
 select count(*) from t2 /* 5 000 */;
 count(*)
 5000
-show binlog events in 'master-bin.000002' from 106;
+show binlog events in 'master-bin.000002' from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000002	106	Query	1	#	use `test`; create table t2 (id int not null primary key auto_increment)
-master-bin.000002	229	Begin_load_query	1	#	;file_id=#;block_len=8192
-master-bin.000002	8444	Append_block	1	#	;file_id=#;block_len=8192
-master-bin.000002	16659	Append_block	1	#	;file_id=#;block_len=7509
-master-bin.000002	24191	Execute_load_query	1	#	use `test`; load data infile 'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2 ;file_id=#
+master-bin.000002	#	Query	#	#	use `test`; create table t2 (id int not null primary key auto_increment)
+master-bin.000002	#	Begin_load_query	#	#	;file_id=#;block_len=#
+master-bin.000002	#	Append_block	#	#	;file_id=#;block_len=#
+master-bin.000002	#	Append_block	#	#	;file_id=#;block_len=#
+master-bin.000002	#	Execute_load_query	#	#	use `test`; load data infile 'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2 ;file_id=#
 select count(*) from t2 /* 5 000 */;
 count(*)
 5000

mysql-test/suite/rpl/r/rpl_row_charset.result

-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
-set timestamp=1000000000;
-drop database if exists mysqltest2;
-drop database if exists mysqltest3;
-create database mysqltest2 character set latin2;
-set @@character_set_server=latin5;
-create database mysqltest3;
-
---- --master--
-show create database mysqltest2;
-Database	Create Database
-mysqltest2	CREATE DATABASE `mysqltest2` /*!40100 DEFAULT CHARACTER SET latin2 */
-show create database mysqltest3;
-Database	Create Database
-mysqltest3	CREATE DATABASE `mysqltest3` /*!40100 DEFAULT CHARACTER SET latin5 */
-
---- --slave--
-show create database mysqltest2;
-Database	Create Database
-mysqltest2	CREATE DATABASE `mysqltest2` /*!40100 DEFAULT CHARACTER SET latin2 */
-show create database mysqltest3;
-Database	Create Database
-mysqltest3	CREATE DATABASE `mysqltest3` /*!40100 DEFAULT CHARACTER SET latin5 */
-set @@collation_server=armscii8_bin;
-drop database mysqltest3;
-create database mysqltest3;
-
---- --master--
-show create database mysqltest3;
-Database	Create Database
-mysqltest3	CREATE DATABASE `mysqltest3` /*!40100 DEFAULT CHARACTER SET armscii8 COLLATE armscii8_bin */
-
---- --slave--
-show create database mysqltest3;
-Database	Create Database
-mysqltest3	CREATE DATABASE `mysqltest3` /*!40100 DEFAULT CHARACTER SET armscii8 COLLATE armscii8_bin */
-use mysqltest2;
-create table t1 (a int auto_increment primary key, b varchar(100))engine=myisam;;
-set character_set_client=cp850, collation_connection=latin2_croatian_ci;
-insert into t1 (b) values(@@character_set_server);
-insert into t1 (b) values(@@collation_server);
-insert into t1 (b) values(@@character_set_client);
-insert into t1 (b) values(@@character_set_connection);
-insert into t1 (b) values(@@collation_connection);
-
---- --master--
-select * from t1 order by a;
-a	b
-1	armscii8
-2	armscii8_bin
-3	cp850
-4	latin2
-5	latin2_croatian_ci
-
---- --slave--
-select * from mysqltest2.t1 order by a;
-a	b
-1	armscii8
-2	armscii8_bin
-3	cp850
-4	latin2
-5	latin2_croatian_ci
-select "--- --muller--" as "";
-
---- --muller--
-set character_set_client=latin1, collation_connection=latin1_german1_ci;
-truncate table t1;
-insert into t1 (b) values(@@collation_connection);
-insert into t1 (b) values(LEAST("Mller","Muffler"));
-set collation_connection=latin1_german2_ci;
-insert into t1 (b) values(@@collation_connection);
-insert into t1 (b) values(LEAST("Mller","Muffler"));
-
---- --master--
-select * from t1 order by a;
-a	b
-1	latin1_german1_ci
-2	Muffler
-3	latin1_german2_ci
-4	Mller
-
---- --slave--
-select * from mysqltest2.t1 order by a;
-a	b
-1	latin1_german1_ci
-2	Muffler
-3	latin1_german2_ci
-4	Mller
-select "--- --INSERT--" as "";
-
---- --INSERT--
-set @a= _cp850 'Mller' collate cp850_general_ci;
-truncate table t1;
-insert into t1 (b) values(collation(@a));
-
---- --master--
-select * from t1 order by a;
-a	b
-1	cp850_general_ci
-
---- --slave--
-select * from mysqltest2.t1 order by a;
-a	b
-1	cp850_general_ci
-drop database mysqltest2;
-drop database mysqltest3;
-show binlog events from <binlog_start>;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	drop database if exists mysqltest2
-master-bin.000001	#	Query	#	#	drop database if exists mysqltest3
-master-bin.000001	#	Query	#	#	create database mysqltest2 character set latin2
-master-bin.000001	#	Query	#	#	create database mysqltest3
-master-bin.000001	#	Query	#	#	drop database mysqltest3
-master-bin.000001	#	Query	#	#	create database mysqltest3
-master-bin.000001	#	Query	#	#	use `mysqltest2`; create table t1 (a int auto_increment primary key, b varchar(100))engine=myisam
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	use `mysqltest2`; truncate table t1
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	use `mysqltest2`; truncate table t1
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	drop database mysqltest2
-master-bin.000001	#	Query	#	#	drop database mysqltest3
-select "--- --global--" as "";
-
---- --global--
-set global character_set_server=latin2;
-set global character_set_server=latin1;
-set global character_set_server=latin2;
-set global character_set_server=latin1;
-select "--- --oneshot--" as "";
-
---- --oneshot--
-set one_shot @@character_set_server=latin5;
-set @@max_join_size=1000;
-select @@character_set_server;
-@@character_set_server
-latin5
-select @@character_set_server;
-@@character_set_server
-latin1
-set @@character_set_server=latin5;
-select @@character_set_server;
-@@character_set_server
-latin5
-select @@character_set_server;
-@@character_set_server
-latin5
-set one_shot max_join_size=10;
-ERROR HY000: The 'SET ONE_SHOT' syntax is reserved for purposes internal to the MySQL server
-set character_set_client=9999999;
-ERROR 42000: Unknown character set: '9999999'
-set collation_server=9999998;
-ERROR HY000: Unknown collation: '9999998'
-select "--- --3943--" as "";
-
---- --3943--
-use test;
-CREATE TABLE t1 (c1 VARBINARY(255), c2 VARBINARY(255))ENGINE=myisam;;
-SET CHARACTER_SET_CLIENT=koi8r,
-CHARACTER_SET_CONNECTION=cp1251, 
-CHARACTER_SET_RESULTS=koi8r;
-INSERT INTO t1 (c1, c2) VALUES (',  ',',  ');
-SET SQL_BIG_SELECTS=1;
-select hex(c1), hex(c2) from t1;
-hex(c1)	hex(c2)
-CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3
-SET SQL_BIG_SELECTS=1;
-select hex(c1), hex(c2) from t1;
-hex(c1)	hex(c2)
-CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3
-drop table t1;
-select "--- --6676--" as "";
-
---- --6676--
-create table `t1` (
-`pk` varchar(10) not null default '', 
-primary key (`pk`)
-) engine=myisam default charset=latin1;
-set @p=_latin1 'test';
-update t1 set pk='test' where pk=@p;
-drop table t1;

mysql-test/suite/rpl/r/rpl_row_charset_innodb.result

-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
-set timestamp=1000000000;
-drop database if exists mysqltest2;
-drop database if exists mysqltest3;
-create database mysqltest2 character set latin2;
-set @@character_set_server=latin5;
-create database mysqltest3;
-
---- --master--
-show create database mysqltest2;
-Database	Create Database
-mysqltest2	CREATE DATABASE `mysqltest2` /*!40100 DEFAULT CHARACTER SET latin2 */
-show create database mysqltest3;
-Database	Create Database
-mysqltest3	CREATE DATABASE `mysqltest3` /*!40100 DEFAULT CHARACTER SET latin5 */
-
---- --slave--
-show create database mysqltest2;
-Database	Create Database
-mysqltest2	CREATE DATABASE `mysqltest2` /*!40100 DEFAULT CHARACTER SET latin2 */
-show create database mysqltest3;
-Database	Create Database
-mysqltest3	CREATE DATABASE `mysqltest3` /*!40100 DEFAULT CHARACTER SET latin5 */
-set @@collation_server=armscii8_bin;
-drop database mysqltest3;
-create database mysqltest3;
-
---- --master--
-show create database mysqltest3;
-Database	Create Database
-mysqltest3	CREATE DATABASE `mysqltest3` /*!40100 DEFAULT CHARACTER SET armscii8 COLLATE armscii8_bin */
-
---- --slave--
-show create database mysqltest3;
-Database	Create Database
-mysqltest3	CREATE DATABASE `mysqltest3` /*!40100 DEFAULT CHARACTER SET armscii8 COLLATE armscii8_bin */
-use mysqltest2;
-create table t1 (a int auto_increment primary key, b varchar(100))engine=innodb;;
-set character_set_client=cp850, collation_connection=latin2_croatian_ci;
-insert into t1 (b) values(@@character_set_server);
-insert into t1 (b) values(@@collation_server);
-insert into t1 (b) values(@@character_set_client);
-insert into t1 (b) values(@@character_set_connection);
-insert into t1 (b) values(@@collation_connection);
-
---- --master--
-select * from t1 order by a;
-a	b
-1	armscii8
-2	armscii8_bin
-3	cp850
-4	latin2
-5	latin2_croatian_ci
-
---- --slave--
-select * from mysqltest2.t1 order by a;
-a	b
-1	armscii8
-2	armscii8_bin
-3	cp850
-4	latin2
-5	latin2_croatian_ci
-select "--- --muller--" as "";
-
---- --muller--
-set character_set_client=latin1, collation_connection=latin1_german1_ci;
-truncate table t1;
-insert into t1 (b) values(@@collation_connection);
-insert into t1 (b) values(LEAST("Mller","Muffler"));
-set collation_connection=latin1_german2_ci;
-insert into t1 (b) values(@@collation_connection);
-insert into t1 (b) values(LEAST("Mller","Muffler"));
-
---- --master--
-select * from t1 order by a;
-a	b
-1	latin1_german1_ci
-2	Muffler
-3	latin1_german2_ci
-4	Mller
-
---- --slave--
-select * from mysqltest2.t1 order by a;
-a	b
-1	latin1_german1_ci
-2	Muffler
-3	latin1_german2_ci
-4	Mller
-select "--- --INSERT--" as "";
-
---- --INSERT--
-set @a= _cp850 'Mller' collate cp850_general_ci;
-truncate table t1;
-insert into t1 (b) values(collation(@a));
-
---- --master--
-select * from t1 order by a;
-a	b
-1	cp850_general_ci
-
---- --slave--
-select * from mysqltest2.t1 order by a;
-a	b
-1	cp850_general_ci
-drop database mysqltest2;
-drop database mysqltest3;
-show binlog events from <binlog_start>;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	drop database if exists mysqltest2
-master-bin.000001	#	Query	#	#	drop database if exists mysqltest3
-master-bin.000001	#	Query	#	#	create database mysqltest2 character set latin2
-master-bin.000001	#	Query	#	#	create database mysqltest3
-master-bin.000001	#	Query	#	#	drop database mysqltest3
-master-bin.000001	#	Query	#	#	create database mysqltest3
-master-bin.000001	#	Query	#	#	use `mysqltest2`; create table t1 (a int auto_increment primary key, b varchar(100))engine=innodb
-master-bin.000001	#	Query	#	#	use `mysqltest2`; BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `mysqltest2`; BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `mysqltest2`; BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `mysqltest2`; BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `mysqltest2`; BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `mysqltest2`; BEGIN
-master-bin.000001	#	Query	#	#	use `mysqltest2`; truncate table t1
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `mysqltest2`; BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `mysqltest2`; BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `mysqltest2`; BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `mysqltest2`; BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `mysqltest2`; BEGIN
-master-bin.000001	#	Query	#	#	use `mysqltest2`; truncate table t1
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `mysqltest2`; BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	drop database mysqltest2
-master-bin.000001	#	Query	#	#	drop database mysqltest3
-select "--- --global--" as "";
-
---- --global--
-set global character_set_server=latin2;
-set global character_set_server=latin1;
-set global character_set_server=latin2;
-set global character_set_server=latin1;
-select "--- --oneshot--" as "";
-
---- --oneshot--
-set one_shot @@character_set_server=latin5;
-set @@max_join_size=1000;
-select @@character_set_server;
-@@character_set_server
-latin5
-select @@character_set_server;
-@@character_set_server
-latin1
-set @@character_set_server=latin5;
-select @@character_set_server;
-@@character_set_server
-latin5
-select @@character_set_server;
-@@character_set_server
-latin5
-set one_shot max_join_size=10;
-ERROR HY000: The 'SET ONE_SHOT' syntax is reserved for purposes internal to the MySQL server
-set character_set_client=9999999;
-ERROR 42000: Unknown character set: '9999999'
-set collation_server=9999998;
-ERROR HY000: Unknown collation: '9999998'
-select "--- --3943--" as "";
-
---- --3943--
-use test;
-CREATE TABLE t1 (c1 VARBINARY(255), c2 VARBINARY(255))ENGINE=innodb;;
-SET CHARACTER_SET_CLIENT=koi8r,
-CHARACTER_SET_CONNECTION=cp1251, 
-CHARACTER_SET_RESULTS=koi8r;
-INSERT INTO t1 (c1, c2) VALUES (',  ',',  ');
-SET SQL_BIG_SELECTS=1;
-select hex(c1), hex(c2) from t1;
-hex(c1)	hex(c2)
-CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3
-SET SQL_BIG_SELECTS=1;
-select hex(c1), hex(c2) from t1;
-hex(c1)	hex(c2)
-CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3
-drop table t1;
-select "--- --6676--" as "";
-
---- --6676--
-create table `t1` (
-`pk` varchar(10) not null default '', 
-primary key (`pk`)
-) engine=innodb default charset=latin1;
-set @p=_latin1 'test';
-update t1 set pk='test' where pk=@p;
-drop table t1;

mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result

@@ -26,7 +26,7 @@ ADD x BIT(3) DEFAULT b'011',
 ADD y BIT(5) DEFAULT b'10101',
 ADD z BIT(2) DEFAULT b'10';
 ALTER TABLE t1_char ADD x CHAR(20) DEFAULT 'Just a test';
-ALTER TABLE t1_nodef ADD x INT NOT NULL;
+ALTER TABLE t1_nodef ADD x INT NOT NULL, ADD y INT NOT NULL, ADD z INT NOT NULL;
 ALTER TABLE t2 DROP b;
 ALTER TABLE t4 MODIFY a FLOAT;
 ALTER TABLE t5 MODIFY b FLOAT;
@@ -393,8 +393,8 @@ INSERT INTO t1_nodef VALUES (1,2);
 INSERT INTO t1_nodef VALUES (2,4);
 SET SQL_LOG_BIN=1;
 **** On Slave ****
-INSERT INTO t1_nodef VALUES (1,2,3);
-INSERT INTO t1_nodef VALUES (2,4,6);
+INSERT INTO t1_nodef VALUES (1,2,3,4,5);
+INSERT INTO t1_nodef VALUES (2,4,6,8,10);
 **** On Master ****
 UPDATE t1_nodef SET b=2*b WHERE a=1;
 SELECT * FROM t1_nodef ORDER BY a;
@@ -403,9 +403,9 @@ a	b
 2	4
 **** On Slave ****
 SELECT * FROM t1_nodef ORDER BY a;
-a	b	x
-1	4	3
-2	4	6
+a	b	x	y	z
+1	4	3	4	5
+2	4	6	8	10
 **** On Master ****
 DELETE FROM t1_nodef WHERE a=2;
 SELECT * FROM t1_nodef ORDER BY a;
@@ -413,8 +413,8 @@ a	b
 1	4
 **** On Slave ****
 SELECT * FROM t1_nodef ORDER BY a;
-a	b	x
-1	4	3
+a	b	x	y	z
+1	4	3	4	5
 **** Cleanup ****
 DROP TABLE IF EXISTS t1_int,t1_bit,t1_char,t1_nodef;
 DROP TABLE IF EXISTS t2,t3,t4,t5,t6,t7,t8,t9;

mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result

@@ -26,7 +26,7 @@ ADD x BIT(3) DEFAULT b'011',
 ADD y BIT(5) DEFAULT b'10101',
 ADD z BIT(2) DEFAULT b'10';
 ALTER TABLE t1_char ADD x CHAR(20) DEFAULT 'Just a test';
-ALTER TABLE t1_nodef ADD x INT NOT NULL;
+ALTER TABLE t1_nodef ADD x INT NOT NULL, ADD y INT NOT NULL, ADD z INT NOT NULL;
 ALTER TABLE t2 DROP b;
 ALTER TABLE t4 MODIFY a FLOAT;
 ALTER TABLE t5 MODIFY b FLOAT;
@@ -393,8 +393,8 @@ INSERT INTO t1_nodef VALUES (1,2);
 INSERT INTO t1_nodef VALUES (2,4);
 SET SQL_LOG_BIN=1;
 **** On Slave ****
-INSERT INTO t1_nodef VALUES (1,2,3);
-INSERT INTO t1_nodef VALUES (2,4,6);
+INSERT INTO t1_nodef VALUES (1,2,3,4,5);
+INSERT INTO t1_nodef VALUES (2,4,6,8,10);
 **** On Master ****
 UPDATE t1_nodef SET b=2*b WHERE a=1;
 SELECT * FROM t1_nodef ORDER BY a;
@@ -403,9 +403,9 @@ a	b
 2	4
 **** On Slave ****
 SELECT * FROM t1_nodef ORDER BY a;
-a	b	x
-1	4	3
-2	4	6
+a	b	x	y	z
+1	4	3	4	5
+2	4	6	8	10
 **** On Master ****
 DELETE FROM t1_nodef WHERE a=2;
 SELECT * FROM t1_nodef ORDER BY a;
@@ -413,8 +413,8 @@ a	b
 1	4
 **** On Slave ****
 SELECT * FROM t1_nodef ORDER BY a;
-a	b	x
-1	4	3
+a	b	x	y	z
+1	4	3	4	5
 **** Cleanup ****
 DROP TABLE IF EXISTS t1_int,t1_bit,t1_char,t1_nodef;
 DROP TABLE IF EXISTS t2,t3,t4,t5,t6,t7,t8,t9;

mysql-test/suite/rpl/t/rpl_stm_charset.test → mysql-test/suite/rpl/t/rpl_charset.test

 let $engine_type=myisam;
--- source extra/rpl_tests/rpl_stm_charset.test
+source extra/rpl_tests/rpl_charset.test;
+

mysql-test/suite/rpl/t/rpl_events.test

@@ -28,10 +28,12 @@ set binlog_format=statement;
 
 connection master;
 
+CREATE TABLE t28953 (a INT);
+
 DELIMITER |;
 CREATE EVENT event1 ON SCHEDULE EVERY 1 YEAR
 DO BEGIN
-	select * from t1;
+	select * from t28953;
 END;|
 DELIMITER ;|
 
@@ -45,3 +47,9 @@ DROP EVENT event2;
 
 sync_slave_with_master;
 
+# Doing cleanup of the table referred to in the event to guarantee
+# that there is no bad timing cauing it to try to access the table.
+
+connection master;
+DROP TABLE t28953;
+sync_slave_with_master;

mysql-test/suite/rpl/t/rpl_loaddata_map.test

@@ -7,6 +7,7 @@
 #  BUG#33413 show binlog events fails if binlog has event size of close
 #            to max_allowed_packet
 
+source include/have_binlog_format_mixed_or_statement.inc;
 source include/master-slave.inc;
 source include/have_innodb.inc;
 source include/have_binlog_format_mixed_or_statement.inc;
@@ -35,9 +36,9 @@ select count(*) from t2 /* 5 000 */;
 
 # the binglog will show fragmented Append_block events
 --let $binlog_start=106
---replace_column 5 #
---replace_regex /\/\* xid=.* \*\//\/* XID *\// /file_id=[0-9]+/file_id=#/
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--replace_column 2 # 4 # 5 #
+--replace_regex /\/\* xid=.* \*\//\/* XID *\// /file_id=[0-9]+/file_id=#/ /block_len=[0-9]+/block_len=#/
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR $binlog_start <binlog_start>
 --eval show binlog events in 'master-bin.000002' from $binlog_start
 
 

mysql-test/suite/rpl/t/rpl_row_charset.test

-########################################################
-# By JBM 2005-02-15 Wrapped to allow reuse of test code#
-# Added to skip if ndb is default                      #
-########################################################
--- source include/not_ndb_default.inc
--- source include/have_binlog_format_row.inc
--- source include/master-slave.inc
-let $engine_type=myisam;
--- source extra/rpl_tests/rpl_row_charset.test

mysql-test/suite/rpl/t/rpl_row_charset_innodb-master.opt

---innodb

mysql-test/suite/rpl/t/rpl_row_charset_innodb-slave.opt

---innodb

mysql-test/suite/rpl/t/rpl_row_charset_innodb.test

-########################################################
-# By JBM 2005-02-15 Wrapped to allow reuse of test code#
-# Added to skip if ndb is default                      #
-########################################################
--- source include/not_ndb_default.inc
--- source include/have_binlog_format_row.inc
--- source include/have_innodb.inc
--- source include/master-slave.inc
-let $engine_type=innodb;
--- source extra/rpl_tests/rpl_row_charset.test

mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt

---default-storage-engine=ndbcluster 
+--new --default-storage-engine=ndbcluster 

mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-slave.opt

---innodb --default-storage-engine=innodb 
+--innodb --default-storage-engine=innodb --ndbcluster=0

mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt

---default-storage-engine=ndbcluster 
+--new --default-storage-engine=ndbcluster

mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb-slave.opt

+--default-storage-engine=ndbcluster --log-slave-updates=0