| List: | Commits | « Previous MessageNext Message » | |
| From: | Jonathan Miller | Date: | February 16 2006 4:42am |
| Subject: | bk commit into 5.1 tree (jmiller:1.2113) | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 5.1 repository of ndbdev. When ndbdev 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 1.2113 06/02/16 04:42:16 jmiller@stripped +63 -0 Test case updates and new test cases added to CRBR mysql-test/t/disabled.def 1.72 06/02/16 03:27:11 jmiller@stripped +4 -2 Updated BitKeeper/deleted/.del-rpl_ndb_max_relay_size.result~1e944e2782e270d8 1.2 06/02/16 01:04:50 jmiller@stripped +0 -0 Delete: mysql-test/r/rpl_ndb_max_relay_size.result BitKeeper/deleted/.del-rpl_ndb_max_relay_size.test~afa6834a51627676 1.2 06/02/16 01:04:38 jmiller@stripped +0 -0 Delete: mysql-test/t/rpl_ndb_max_relay_size.test mysql-test/r/rpl_row_basic_11bugs.result 1.4 06/02/15 22:59:42 jmiller@stripped +0 -5 Updated results mysql-test/t/rpl_row_basic_11bugs.test 1.3 06/02/15 22:59:30 jmiller@stripped +1 -1 Removed show binlog as it is not needed for test mysql-test/r/rpl_row_sp008.result 1.2 06/02/15 22:51:53 jmiller@stripped +0 -12 Updated results mysql-test/t/rpl_row_sp008.test 1.3 06/02/15 22:51:34 jmiller@stripped +0 -5 Removed show binlog as it is not needed for test mysql-test/r/rpl_ndb_max_relay_size.result 1.1 06/02/15 22:42:04 jmiller@stripped +61 -0 New results mysql-test/r/rpl_ndb_max_relay_size.result 1.0 06/02/15 22:42:04 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/rpl_ndb_max_relay_size.result mysql-test/t/rpl_ndb_max_relay_size.test 1.1 06/02/15 22:41:43 jmiller@stripped +10 -0 New wrapper for ndb mysql-test/t/rpl_ndb_max_relay_size.test 1.0 06/02/15 22:41:43 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_ndb_max_relay_size.test mysql-test/t/rpl_row_max_relay_size.test 1.2 06/02/15 22:41:16 jmiller@stripped +1 -0 Updated mysql-test/t/rpl_row_until.test 1.2 06/02/15 22:18:31 jmiller@stripped +1 -0 Updated to skip when ndb is default. ndb bin logs are different size, so test would need to be rewitten for ndb mysql-test/r/rpl_ndb_charset.result 1.1 06/02/15 22:11:13 jmiller@stripped +201 -0 New results file mysql-test/r/rpl_ndb_charset.result 1.0 06/02/15 22:11:13 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/rpl_ndb_charset.result mysql-test/t/rpl_ndb_charset.test 1.1 06/02/15 22:10:50 jmiller@stripped +6 -0 New wrapper for ndb mysql-test/t/rpl_ndb_charset.test 1.0 06/02/15 22:10:50 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_ndb_charset.test mysql-test/r/rpl_row_delayed_ins.result 1.2 06/02/15 21:52:21 jmiller@stripped +2 -2 Updated results file mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test 1.2 06/02/15 21:52:06 jmiller@stripped +2 -2 Updated with order by mysql-test/r/rpl_ndb_UUID.result 1.1 06/02/15 21:44:41 jmiller@stripped +40 -0 New results file mysql-test/r/rpl_ndb_UUID.result 1.0 06/02/15 21:44:41 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/rpl_ndb_UUID.result mysql-test/t/rpl_ndb_UUID.test 1.1 06/02/15 21:44:21 jmiller@stripped +6 -0 New wrapper for ndb mysql-test/t/rpl_ndb_UUID.test 1.0 06/02/15 21:44:21 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_ndb_UUID.test mysql-test/r/rpl_ndb_row_001.result 1.1 06/02/15 21:36:29 jmiller@stripped +55 -0 New results file mysql-test/r/rpl_ndb_row_001.result 1.0 06/02/15 21:36:29 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/rpl_ndb_row_001.result mysql-test/t/rpl_ndb_row_001.test 1.1 06/02/15 21:35:59 jmiller@stripped +6 -0 New wrapper for ndb mysql-test/t/rpl_ndb_row_001.test 1.0 06/02/15 21:35:59 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_ndb_row_001.test mysql-test/t/rpl_row_sp007_innodb.test 1.2 06/02/15 19:05:38 jmiller@stripped +5 -0 Updated mysql-test/t/rpl_row_sp006_InnoDB.test 1.2 06/02/15 19:04:52 jmiller@stripped +5 -0 Updated mysql-test/t/rpl_row_sp003.test 1.2 06/02/15 19:04:15 jmiller@stripped +5 -0 Updated mysql-test/t/rpl_row_sp002_innodb.test 1.2 06/02/15 19:03:23 jmiller@stripped +5 -0 Updated mysql-test/t/rpl_row_log_innodb.test 1.2 06/02/15 19:02:38 jmiller@stripped +1 -0 Updated mysql-test/t/rpl_row_func003.test 1.2 06/02/15 19:01:47 jmiller@stripped +5 -0 Updated mysql-test/t/rpl_row_blob_innodb.test 1.3 06/02/15 19:01:01 jmiller@stripped +5 -0 Updated mysql-test/t/rpl_relay_space_innodb.test 1.3 06/02/15 19:00:22 jmiller@stripped +1 -0 Updated mysql-test/t/rpl_insert_id.test 1.16 06/02/15 18:59:03 jmiller@stripped +5 -0 Updated mysql-test/t/rpl_insert_id_pk.test 1.2 06/02/15 18:58:22 jmiller@stripped +5 -0 Updated mysql-test/t/rpl_foreign_key_innodb.test 1.4 06/02/15 18:56:03 jmiller@stripped +1 -0 Updated mysql-test/t/rpl_failed_optimize.test 1.5 06/02/15 18:55:16 jmiller@stripped +5 -0 Updated mysql-test/t/rpl_deadlock_innodb.test 1.2 06/02/15 18:54:39 jmiller@stripped +5 -0 Updated mysql-test/t/rpl_commit_after_flush.test 1.8 06/02/15 18:53:53 jmiller@stripped +4 -0 Updated mysql-test/t/rpl_auto_increment.test 1.4 06/02/15 18:53:15 jmiller@stripped +5 -0 Updated mysql-test/t/rpl_row_UUID.test 1.2 06/02/15 18:52:09 jmiller@stripped +5 -0 Updated mysql-test/t/rpl_row_log.test 1.2 06/02/15 18:51:37 jmiller@stripped +5 -0 Updated mysql-test/t/rpl_row_delayed_ins.test 1.2 06/02/15 18:50:51 jmiller@stripped +5 -0 Updated mysql-test/t/rpl_row_charset.test 1.2 06/02/15 18:50:06 jmiller@stripped +5 -0 Updated mysql-test/t/rpl_row_blob_myisam.test 1.2 06/02/15 18:49:33 jmiller@stripped +5 -0 Updated mysql-test/t/rpl_row_001.test 1.2 06/02/15 18:48:57 jmiller@stripped +5 -0 Updated mysql-test/t/rpl_relay_space_myisam.test 1.3 06/02/15 18:48:15 jmiller@stripped +1 -0 Updated mysql-test/t/rpl_multi_update.test 1.12 06/02/15 18:47:15 jmiller@stripped +5 -0 Updated mysql-test/t/rpl_loaddata.test 1.26 06/02/15 18:46:00 jmiller@stripped +5 -0 Updated mysql-test/r/rpl_ndb_relayrotate.result 1.1 06/02/15 18:40:37 jmiller@stripped +16 -0 New results file mysql-test/r/rpl_ndb_relayrotate.result 1.0 06/02/15 18:40:37 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/rpl_ndb_relayrotate.result mysql-test/t/rpl_ndb_relayrotate-slave.opt 1.1 06/02/15 18:39:48 jmiller@stripped +3 -0 New option file for ndb slave mysql-test/t/rpl_ndb_relayrotate-slave.opt 1.0 06/02/15 18:39:48 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_ndb_relayrotate-slave.opt mysql-test/t/rpl_ndb_relayrotate.test 1.1 06/02/15 18:39:22 jmiller@stripped +8 -0 New wrapper for ndb mysql-test/t/rpl_ndb_relayrotate.test 1.0 06/02/15 18:39:22 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_ndb_relayrotate.test mysql-test/t/rpl_relayrotate.test 1.18 06/02/15 18:38:53 jmiller@stripped +7 -0 added comments and ability to sjip when ndb is default engine mysql-test/r/rpl_ndb_multi_update3.result 1.1 06/02/15 18:21:08 jmiller@stripped +196 -0 New results file mysql-test/r/rpl_ndb_multi_update3.result 1.0 06/02/15 18:21:08 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/rpl_ndb_multi_update3.result mysql-test/t/rpl_ndb_multi_update3.test 1.1 06/02/15 18:20:56 jmiller@stripped +7 -0 New ndb wrapper for test case mysql-test/t/rpl_ndb_multi_update3.test 1.0 06/02/15 18:20:56 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_ndb_multi_update3.test mysql-test/t/rpl_multi_update3.test 1.8 06/02/15 18:20:46 jmiller@stripped +7 -0 Updated to skip ndb default engine + added comments mysql-test/r/rpl_ndb_multi_update2.result 1.1 06/02/15 18:08:04 jmiller@stripped +55 -0 New results file mysql-test/r/rpl_ndb_multi_update2.result 1.0 06/02/15 18:08:04 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/rpl_ndb_multi_update2.result mysql-test/t/rpl_ndb_multi_update2-slave.opt 1.1 06/02/15 18:07:39 jmiller@stripped +1 -0 New slave option file to go with new NDB test wrapper mysql-test/t/rpl_ndb_multi_update2-slave.opt 1.0 06/02/15 18:07:39 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_ndb_multi_update2-slave.opt mysql-test/t/rpl_ndb_multi_update2.test 1.1 06/02/15 18:07:06 jmiller@stripped +7 -0 New ndb wrapper for test case mysql-test/t/rpl_ndb_multi_update2.test 1.0 06/02/15 18:07:06 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_ndb_multi_update2.test mysql-test/t/rpl_multi_update2.test 1.8 06/02/15 18:06:29 jmiller@stripped +7 -0 Updated to skip ndb default engine + added comments mysql-test/r/rpl_ndb_insert_ignore.result 1.1 06/02/15 17:51:06 jmiller@stripped +70 -0 New Results file mysql-test/r/rpl_ndb_insert_ignore.result 1.0 06/02/15 17:51:06 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/rpl_ndb_insert_ignore.result mysql-test/t/rpl_ndb_insert_ignore.test 1.1 06/02/15 17:50:49 jmiller@stripped +7 -0 New wrapper for ndb mysql-test/t/rpl_ndb_insert_ignore.test 1.0 06/02/15 17:50:49 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_ndb_insert_ignore.test mysql-test/t/rpl_insert_ignore.test 1.4 06/02/15 17:50:30 jmiller@stripped +1 -0 Added to skip ndb if default engine mysql-test/t/disabled.def 1.71 06/02/15 17:50:00 jmiller@stripped +1 -0 Added test to disable mysql-test/r/rpl_ndb_ddl.result 1.1 06/02/15 16:57:28 jmiller@stripped +1693 -0 new wrapper for ndb mysql-test/r/rpl_ndb_ddl.result 1.0 06/02/15 16:57:28 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/rpl_ndb_ddl.result mysql-test/t/rpl_ndb_ddl.test 1.1 06/02/15 16:57:20 jmiller@stripped +34 -0 new wrapper for ndb mysql-test/t/rpl_ndb_ddl.test 1.0 06/02/15 16:57:20 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_ndb_ddl.test mysql-test/t/rpl_ddl.test 1.4 06/02/15 16:56:51 jmiller@stripped +2 -2 Added to skip default ndb engine mysql-test/t/disabled.def 1.70 06/02/15 16:56:30 jmiller@stripped +1 -0 Added test mysql-test/r/rpl_ndb_commit_afterflush.result 1.1 06/02/15 16:41:07 jmiller@stripped +13 -0 New results file mysql-test/r/rpl_ndb_commit_afterflush.result 1.0 06/02/15 16:41:07 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/rpl_ndb_commit_afterflush.result mysql-test/t/rpl_ndb_commit_afterflush.test 1.2 06/02/15 16:40:47 jmiller@stripped +3 -0 added comments mysql-test/t/rpl_ndb_commit_afterflush.test 1.1 06/02/15 16:39:16 jmiller@stripped +6 -0 New wrapper for ndb mysql-test/t/rpl_ndb_commit_afterflush.test 1.0 06/02/15 16:39:16 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_ndb_commit_afterflush.test mysql-test/t/rpl_commit_after_flush.test 1.7 06/02/15 16:38:50 jmiller@stripped +1 -0 Added to skip default ndb engine BitKeeper/deleted/.del-rpl_row_multi_update3.result~1a3a8438eaaf11f2 1.2 06/02/15 14:35:18 jmiller@stripped +0 -0 Delete: mysql-test/r/rpl_row_multi_update3.result BitKeeper/deleted/.del-rpl_row_multi_update3.test~b366698f8379f38f 1.2 06/02/15 14:35:04 jmiller@stripped +0 -0 Delete: mysql-test/extra/rpl_tests/rpl_row_multi_update3.test BitKeeper/deleted/.del-rpl_row_multi_update3.test~fcf9a2234bd0f1b 1.2 06/02/15 14:34:51 jmiller@stripped +0 -0 Delete: mysql-test/t/rpl_row_multi_update3.test # 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: jmiller # Host: ndb08.mysql.com # Root: /home/ndbdev/jmiller/clones/mysql-5.1-new --- 1.7/mysql-test/t/rpl_multi_update2.test 2005-12-22 05:10:58 +01:00 +++ 1.8/mysql-test/t/rpl_multi_update2.test 2006-02-15 18:06:29 +01:00 @@ -1,2 +1,9 @@ +####################################################### +# Wrapper for rpl_multi_update2.test to allow multi # +# Engines to reuse test code. By JBM 2006-02-15 # +# Added comments section and to skip when ndb is # +# Default engine. # +####################################################### +--source include/not_ndb_default.inc let $engine_type=MyISAM; --source extra/rpl_tests/rpl_multi_update2.test --- 1.7/mysql-test/t/rpl_multi_update3.test 2006-02-07 17:20:41 +01:00 +++ 1.8/mysql-test/t/rpl_multi_update3.test 2006-02-15 18:20:46 +01:00 @@ -1,2 +1,9 @@ +####################################################### +# Wrapper for rpl_multi_update3.test to allow multi # +# Engines to reuse test code. By JBM 2006-02-15 # +# Added comments section and to skip when ndb is # +# Default engine. # +####################################################### +--source include/not_ndb_default.inc let $engine_type=MyISAM; -- source extra/rpl_tests/rpl_multi_update3.test --- 1.6/mysql-test/t/rpl_commit_after_flush.test 2005-12-22 05:10:58 +01:00 +++ 1.8/mysql-test/t/rpl_commit_after_flush.test 2006-02-15 18:53:53 +01:00 @@ -1,6 +1,11 @@ ##################################### # Wrapper for rpl_commit_after_flush# ##################################### +######################################################## +# 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_innodb.inc let $engine_type=innodb; -- source extra/rpl_tests/rpl_commit_after_flush.test --- 1.3/mysql-test/t/rpl_insert_ignore.test 2005-12-22 05:10:58 +01:00 +++ 1.4/mysql-test/t/rpl_insert_ignore.test 2006-02-15 17:50:30 +01:00 @@ -1,6 +1,7 @@ ##################################### # Wrapper for rpl_insert_ignore.test# ##################################### +-- source include/not_ndb_default.inc -- source include/have_innodb.inc let $engine_type=innodb; let $engine_type2=myisam; --- 1.11/mysql-test/t/rpl_multi_update.test 2005-12-22 05:10:58 +01:00 +++ 1.12/mysql-test/t/rpl_multi_update.test 2006-02-15 18:47:15 +01:00 @@ -1,2 +1,7 @@ +######################################################## +# 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 let $engine_type=MyISAM; -- source extra/rpl_tests/rpl_multi_update.test --- 1.17/mysql-test/t/rpl_relayrotate.test 2005-12-22 05:10:58 +01:00 +++ 1.18/mysql-test/t/rpl_relayrotate.test 2006-02-15 18:38:53 +01:00 @@ -1,3 +1,10 @@ +####################################################### +# Wrapper for rpl_relayrotate.test to allow multi # +# Engines to reuse test code. By JBM 2006-02-15 # +# Added comments section and to skip when ndb is # +# Default engine. # +####################################################### +-- source include/not_ndb_default.inc -- source include/have_innodb.inc let $engine_type=innodb; -- source extra/rpl_tests/rpl_relayrotate.test --- New file --- +++ mysql-test/r/rpl_ndb_UUID.result 06/02/15 21:44:41 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; DROP PROCEDURE IF EXISTS test.p1; DROP TABLE IF EXISTS test.t1; CREATE TABLE test.t1 (a INT, blob_column LONGBLOB, vchar_column VARCHAR(100), PRIMARY KEY(a)) engine=NDB; INSERT INTO test.t1 VALUES(1,UUID(),UUID()); create procedure test.p1() begin INSERT INTO test.t1 VALUES(2,UUID(),UUID()); INSERT INTO test.t1 VALUES(3,UUID(),UUID()); end| CALL test.p1(); create function test.fn1(x int) returns int begin insert into t1 values (4+x,UUID(),UUID()); insert into t1 values (5+x,UUID(),UUID()); return 0; end| select fn1(0); fn1(0) 0 create table t2 (a int); insert into t2 values(fn1(2)); SHOW CREATE TABLE test.t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL default '0', `blob_column` longblob, `vchar_column` varchar(100) default NULL, PRIMARY KEY (`a`) ) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () DROP PROCEDURE test.p1; DROP FUNCTION test.fn1; DROP TABLE test.t1; DROP TABLE test.t2; --- New file --- +++ mysql-test/r/rpl_ndb_charset.result 06/02/15 22:11:13 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)); 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("Müller","Muffler")); set collation_connection=latin1_german2_ci; insert into t1 (b) values(@@collation_connection); insert into t1 (b) values(LEAST("Müller","Muffler")); --- --master-- select * from t1 order by a; a b 1 latin1_german1_ci 2 Muffler 3 latin1_german2_ci 4 Müller --- --slave-- select * from mysqltest2.t1 order by a; a b 1 latin1_german1_ci 2 Muffler 3 latin1_german2_ci 4 Müller select "--- --INSERT--" as ""; --- --INSERT-- set @a= _cp850 'Müller' 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 102; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query 1 # drop database if exists mysqltest2 master-bin.000001 # Query 1 # drop database if exists mysqltest3 master-bin.000001 # Query 1 # create database mysqltest2 character set latin2 master-bin.000001 # Query 1 # create database mysqltest3 master-bin.000001 # Query 1 # drop database mysqltest3 master-bin.000001 # Query 1 # create database mysqltest3 master-bin.000001 # Query 1 # use `mysqltest2`; create table t1 (a int auto_increment primary key, b varchar(100)) master-bin.000001 # Table_map 1 # mysqltest2.t1 master-bin.000001 # Write_rows 1 # master-bin.000001 # Table_map 1 # mysqltest2.t1 master-bin.000001 # Write_rows 1 # master-bin.000001 # Table_map 1 # mysqltest2.t1 master-bin.000001 # Write_rows 1 # master-bin.000001 # Table_map 1 # mysqltest2.t1 master-bin.000001 # Write_rows 1 # master-bin.000001 # Table_map 1 # mysqltest2.t1 master-bin.000001 # Write_rows 1 # master-bin.000001 # Query 1 # use `mysqltest2`; truncate table t1 master-bin.000001 # Table_map 1 # mysqltest2.t1 master-bin.000001 # Write_rows 1 # master-bin.000001 # Table_map 1 # mysqltest2.t1 master-bin.000001 # Write_rows 1 # master-bin.000001 # Table_map 1 # mysqltest2.t1 master-bin.000001 # Write_rows 1 # master-bin.000001 # Table_map 1 # mysqltest2.t1 master-bin.000001 # Write_rows 1 # master-bin.000001 # Query 1 # use `mysqltest2`; truncate table t1 master-bin.000001 # Table_map 1 # mysqltest2.t1 master-bin.000001 # Write_rows 1 # master-bin.000001 # Query 1 # drop database mysqltest2 master-bin.000001 # Query 1 # 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)); SET CHARACTER_SET_CLIENT=koi8r, CHARACTER_SET_CONNECTION=cp1251, CHARACTER_SET_RESULTS=koi8r; INSERT INTO t1 (c1, c2) VALUES ('îÕ, ÚÁ ÒÙÂÁÌËÕ','îÕ, ÚÁ ÒÙÂÁÌËÕ'); select hex(c1), hex(c2) from t1; hex(c1) hex(c2) CDF32C20E7E020F0FBE1E0EBEAF3 CDF32C20E7E020F0FBE1E0EBEAF3 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; set @p=_latin1 'test'; update t1 set pk='test' where pk=@p; drop table t1; --- New file --- +++ mysql-test/r/rpl_ndb_commit_afterflush.result 06/02/15 16:41:07 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; CREATE TABLE t1 (a INT) ENGINE=NDB; begin; insert into t1 values(1); flush tables with read lock; commit; unlock tables; drop table t1; --- New file --- +++ mysql-test/r/rpl_ndb_ddl.result 06/02/15 16:57:28 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 AUTOCOMMIT = 1; DROP DATABASE IF EXISTS mysqltest1; DROP DATABASE IF EXISTS mysqltest2; DROP DATABASE IF EXISTS mysqltest3; CREATE DATABASE mysqltest1; CREATE DATABASE mysqltest2; CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE="NDB"; INSERT INTO mysqltest1.t1 SET f1= 0; CREATE TABLE mysqltest1.t2 (f1 BIGINT) ENGINE="NDB"; CREATE TABLE mysqltest1.t3 (f1 BIGINT) ENGINE="NDB"; CREATE TABLE mysqltest1.t4 (f1 BIGINT) ENGINE="NDB"; CREATE TABLE mysqltest1.t5 (f1 BIGINT) ENGINE="NDB"; CREATE TABLE mysqltest1.t6 (f1 BIGINT) ENGINE="NDB"; CREATE INDEX my_idx6 ON mysqltest1.t6(f1); CREATE TABLE mysqltest1.t7 (f1 BIGINT) ENGINE="NDB"; INSERT INTO mysqltest1.t7 SET f1= 0; CREATE TABLE mysqltest1.t8 (f1 BIGINT) ENGINE="NDB"; CREATE TABLE mysqltest1.t9 (f1 BIGINT) ENGINE="NDB"; CREATE TABLE mysqltest1.t10 (f1 BIGINT) ENGINE="NDB"; CREATE TABLE mysqltest1.t11 (f1 BIGINT) ENGINE="NDB"; CREATE TABLE mysqltest1.t12 (f1 BIGINT) ENGINE="NDB"; CREATE TABLE mysqltest1.t13 (f1 BIGINT) ENGINE="NDB"; CREATE TABLE mysqltest1.t14 (f1 BIGINT) ENGINE="NDB"; CREATE TABLE mysqltest1.t15 (f1 BIGINT) ENGINE="NDB"; CREATE TABLE mysqltest1.t16 (f1 BIGINT) ENGINE="NDB"; CREATE TABLE mysqltest1.t17 (f1 BIGINT) ENGINE="NDB"; CREATE TABLE mysqltest1.t18 (f1 BIGINT) ENGINE="NDB"; CREATE TABLE mysqltest1.t19 (f1 BIGINT) ENGINE="NDB"; CREATE TEMPORARY TABLE mysqltest1.t23 (f1 BIGINT); SET AUTOCOMMIT = 0; use mysqltest1; -------- switch to slave -------- SET AUTOCOMMIT = 0; use mysqltest1; -------- switch to master ------- ######## COMMIT ######## -------- switch to master ------- INSERT INTO t1 SET f1= 0 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 1 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 0 -------- switch to master ------- COMMIT; SELECT MAX(f1) FROM t1; MAX(f1) 1 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 1 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 1 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 1 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- ######## ROLLBACK ######## -------- switch to master ------- INSERT INTO t1 SET f1= 1 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 2 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 1 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 1 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 1 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 1 TEST-INFO: MASTER: The INSERT is not committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 1 TEST-INFO: SLAVE: The INSERT is not committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- ######## SET AUTOCOMMIT=1 ######## -------- switch to master ------- INSERT INTO t1 SET f1= 1 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 2 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 1 -------- switch to master ------- SET AUTOCOMMIT=1; SELECT MAX(f1) FROM t1; MAX(f1) 2 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 2 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 2 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 2 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- SET AUTOCOMMIT=0; ######## START TRANSACTION ######## -------- switch to master ------- INSERT INTO t1 SET f1= 2 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 3 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 2 -------- switch to master ------- START TRANSACTION; SELECT MAX(f1) FROM t1; MAX(f1) 3 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 3 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 3 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 3 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- ######## BEGIN ######## -------- switch to master ------- INSERT INTO t1 SET f1= 3 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 3 -------- switch to master ------- BEGIN; SELECT MAX(f1) FROM t1; MAX(f1) 4 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 4 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 4 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 4 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- ######## DROP TABLE mysqltest1.t2 ######## -------- switch to master ------- INSERT INTO t1 SET f1= 4 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 5 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 4 -------- switch to master ------- DROP TABLE mysqltest1.t2; SELECT MAX(f1) FROM t1; MAX(f1) 5 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 5 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 5 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 5 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- SHOW TABLES LIKE 't2'; Tables_in_mysqltest1 (t2) -------- switch to slave -------- SHOW TABLES LIKE 't2'; Tables_in_mysqltest1 (t2) -------- switch to master ------- ######## DROP TEMPORARY TABLE mysqltest1.t23 ######## -------- switch to master ------- INSERT INTO t1 SET f1= 5 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 6 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 5 -------- switch to master ------- DROP TEMPORARY TABLE mysqltest1.t23; SELECT MAX(f1) FROM t1; MAX(f1) 6 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 5 -------- switch to master ------- ROLLBACK; Warnings: Warning 1196 Some non-transactional changed tables couldn't be rolled back SELECT MAX(f1) FROM t1; MAX(f1) 5 TEST-INFO: MASTER: The INSERT is not committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 6 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- SHOW TABLES LIKE 't23'; Tables_in_mysqltest1 (t23) -------- switch to slave -------- SHOW TABLES LIKE 't23'; Tables_in_mysqltest1 (t23) -------- switch to master ------- ######## RENAME TABLE mysqltest1.t3 to mysqltest1.t20 ######## -------- switch to master ------- INSERT INTO t1 SET f1= 5 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 6 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 6 -------- switch to master ------- RENAME TABLE mysqltest1.t3 to mysqltest1.t20; SELECT MAX(f1) FROM t1; MAX(f1) 6 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 6 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 6 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 6 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- SHOW TABLES LIKE 't20'; Tables_in_mysqltest1 (t20) t20 -------- switch to slave -------- SHOW TABLES LIKE 't20'; Tables_in_mysqltest1 (t20) t20 -------- switch to master ------- ######## ALTER TABLE mysqltest1.t4 ADD column f2 BIGINT ######## -------- switch to master ------- INSERT INTO t1 SET f1= 6 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 7 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 6 -------- switch to master ------- ALTER TABLE mysqltest1.t4 ADD column f2 BIGINT; SELECT MAX(f1) FROM t1; MAX(f1) 7 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 7 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 7 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 7 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- describe mysqltest1.t4; Field Type Null Key Default Extra f1 bigint(20) YES NULL f2 bigint(20) YES NULL -------- switch to slave -------- describe mysqltest1.t4; Field Type Null Key Default Extra f1 bigint(20) YES NULL f2 bigint(20) YES NULL -------- switch to master ------- ######## CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE= "InnoDB" ######## -------- switch to master ------- INSERT INTO t1 SET f1= 7 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 8 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 7 -------- switch to master ------- CREATE TABLE mysqltest1.t21 (f1 BIGINT) ENGINE= "InnoDB"; SELECT MAX(f1) FROM t1; MAX(f1) 8 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 8 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 8 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 8 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- ######## CREATE TEMPORARY TABLE mysqltest1.t22 (f1 BIGINT) ######## -------- switch to master ------- INSERT INTO t1 SET f1= 8 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 9 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 8 -------- switch to master ------- CREATE TEMPORARY TABLE mysqltest1.t22 (f1 BIGINT); SELECT MAX(f1) FROM t1; MAX(f1) 9 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 8 -------- switch to master ------- ROLLBACK; Warnings: Warning 1196 Some non-transactional changed tables couldn't be rolled back SELECT MAX(f1) FROM t1; MAX(f1) 8 TEST-INFO: MASTER: The INSERT is not committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 9 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- ######## TRUNCATE TABLE mysqltest1.t7 ######## -------- switch to master ------- INSERT INTO t1 SET f1= 8 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 9 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 9 -------- switch to master ------- TRUNCATE TABLE mysqltest1.t7; SELECT MAX(f1) FROM t1; MAX(f1) 9 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 9 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 9 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 9 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- SELECT * FROM mysqltest1.t7; f1 -------- switch to slave -------- SELECT * FROM mysqltest1.t7; f1 -------- switch to master ------- ######## LOCK TABLES mysqltest1.t1 WRITE, mysqltest1.t8 READ ######## -------- switch to master ------- INSERT INTO t1 SET f1= 9 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 10 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 9 -------- switch to master ------- LOCK TABLES mysqltest1.t1 WRITE, mysqltest1.t8 READ; SELECT MAX(f1) FROM t1; MAX(f1) 10 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 10 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 10 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 10 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- UNLOCK TABLES; ######## UNLOCK TABLES ######## -------- switch to master ------- INSERT INTO t1 SET f1= 10 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 11 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 10 -------- switch to master ------- UNLOCK TABLES; SELECT MAX(f1) FROM t1; MAX(f1) 11 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 10 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 10 TEST-INFO: MASTER: The INSERT is not committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 10 TEST-INFO: SLAVE: The INSERT is not committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- LOCK TABLES mysqltest1.t1 READ; ######## UNLOCK TABLES ######## -------- switch to master ------- INSERT INTO t1 SET f1= 10 + 1; ERROR HY000: Table 't1' was locked with a READ lock and can't be updated SELECT MAX(f1) FROM t1; MAX(f1) 10 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 10 -------- switch to master ------- UNLOCK TABLES; SELECT MAX(f1) FROM t1; MAX(f1) 10 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 10 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 10 TEST-INFO: MASTER: The INSERT is not committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 10 TEST-INFO: SLAVE: The INSERT is not committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- LOCK TABLES mysqltest1.t1 WRITE, mysqltest1.t8 READ; ######## UNLOCK TABLES ######## -------- switch to master ------- INSERT INTO t1 SET f1= 10 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 11 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 10 -------- switch to master ------- UNLOCK TABLES; SELECT MAX(f1) FROM t1; MAX(f1) 11 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 11 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 11 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 11 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- ######## DROP INDEX my_idx6 ON mysqltest1.t6 ######## -------- switch to master ------- INSERT INTO t1 SET f1= 11 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 12 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 11 -------- switch to master ------- DROP INDEX my_idx6 ON mysqltest1.t6; SELECT MAX(f1) FROM t1; MAX(f1) 12 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 12 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 12 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 12 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- SHOW INDEX FROM mysqltest1.t6; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment -------- switch to slave -------- SHOW INDEX FROM mysqltest1.t6; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment -------- switch to master ------- ######## CREATE INDEX my_idx5 ON mysqltest1.t5(f1) ######## -------- switch to master ------- INSERT INTO t1 SET f1= 12 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 13 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 12 -------- switch to master ------- CREATE INDEX my_idx5 ON mysqltest1.t5(f1); SELECT MAX(f1) FROM t1; MAX(f1) 13 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 13 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 13 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 13 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- SHOW INDEX FROM mysqltest1.t5; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment t5 1 my_idx5 1 f1 A 0 NULL NULL YES BTREE -------- switch to slave -------- SHOW INDEX FROM mysqltest1.t5; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment t5 1 my_idx5 1 f1 A NULL NULL NULL YES BTREE -------- switch to master ------- ######## DROP DATABASE mysqltest2 ######## -------- switch to master ------- INSERT INTO t1 SET f1= 13 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 14 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 13 -------- switch to master ------- DROP DATABASE mysqltest2; SELECT MAX(f1) FROM t1; MAX(f1) 14 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 14 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 14 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 14 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- SHOW DATABASES LIKE "mysqltest2"; Database (mysqltest2) -------- switch to slave -------- SHOW DATABASES LIKE "mysqltest2"; Database (mysqltest2) -------- switch to master ------- ######## CREATE DATABASE mysqltest3 ######## -------- switch to master ------- INSERT INTO t1 SET f1= 14 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 15 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 14 -------- switch to master ------- CREATE DATABASE mysqltest3; SELECT MAX(f1) FROM t1; MAX(f1) 15 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 15 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 15 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 15 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- SHOW DATABASES LIKE "mysqltest3"; Database (mysqltest3) mysqltest3 -------- switch to slave -------- SHOW DATABASES LIKE "mysqltest3"; Database (mysqltest3) mysqltest3 -------- switch to master ------- ######## CREATE PROCEDURE p1() READS SQL DATA SELECT "this is p1" ######## -------- switch to master ------- INSERT INTO t1 SET f1= 15 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 16 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 15 -------- switch to master ------- CREATE PROCEDURE p1() READS SQL DATA SELECT "this is p1"; SELECT MAX(f1) FROM t1; MAX(f1) 16 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 16 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 16 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 16 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- SHOW PROCEDURE STATUS LIKE 'p1'; Db mysqltest1 Name p1 Type PROCEDURE Definer root@localhost Modified # Created # Security_type DEFINER Comment -------- switch to slave ------- SHOW PROCEDURE STATUS LIKE 'p1'; Db mysqltest1 Name p1 Type PROCEDURE Definer root@localhost Modified # Created # Security_type DEFINER Comment ######## ALTER PROCEDURE p1 COMMENT "I have been altered" ######## -------- switch to master ------- INSERT INTO t1 SET f1= 16 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 17 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 16 -------- switch to master ------- ALTER PROCEDURE p1 COMMENT "I have been altered"; SELECT MAX(f1) FROM t1; MAX(f1) 17 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 17 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 17 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 17 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- SHOW PROCEDURE STATUS LIKE 'p1'; Db mysqltest1 Name p1 Type PROCEDURE Definer root@localhost Modified # Created # Security_type DEFINER Comment I have been altered -------- switch to slave ------- SHOW PROCEDURE STATUS LIKE 'p1'; Db mysqltest1 Name p1 Type PROCEDURE Definer root@localhost Modified # Created # Security_type DEFINER Comment I have been altered ######## DROP PROCEDURE p1 ######## -------- switch to master ------- INSERT INTO t1 SET f1= 17 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 18 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 17 -------- switch to master ------- DROP PROCEDURE p1; SELECT MAX(f1) FROM t1; MAX(f1) 18 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 18 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 18 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 18 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- SHOW PROCEDURE STATUS LIKE 'p1'; -------- switch to slave ------- SHOW PROCEDURE STATUS LIKE 'p1'; ######## CREATE OR REPLACE VIEW v1 as select * from t1 ######## -------- switch to master ------- INSERT INTO t1 SET f1= 18 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 19 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 18 -------- switch to master ------- CREATE OR REPLACE VIEW v1 as select * from t1; SELECT MAX(f1) FROM t1; MAX(f1) 19 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 19 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 19 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 19 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- SHOW CREATE VIEW v1; View Create View v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` -------- switch to slave ------- SHOW CREATE VIEW v1; View Create View v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` ######## ALTER VIEW v1 AS select f1 from t1 ######## -------- switch to master ------- INSERT INTO t1 SET f1= 19 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 20 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 19 -------- switch to master ------- ALTER VIEW v1 AS select f1 from t1; SELECT MAX(f1) FROM t1; MAX(f1) 20 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 20 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 20 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 20 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- SHOW CREATE VIEW v1; View Create View v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` -------- switch to slave ------- SHOW CREATE VIEW v1; View Create View v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` ######## DROP VIEW IF EXISTS v1 ######## -------- switch to master ------- INSERT INTO t1 SET f1= 20 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 21 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 20 -------- switch to master ------- DROP VIEW IF EXISTS v1; SELECT MAX(f1) FROM t1; MAX(f1) 21 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 21 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 21 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 21 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- SHOW CREATE VIEW v1; ERROR 42S02: Table 'mysqltest1.v1' doesn't exist -------- switch to slave ------- SHOW CREATE VIEW v1; ERROR 42S02: Table 'mysqltest1.v1' doesn't exist ######## CREATE TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW SET @a:=1 ######## -------- switch to master ------- INSERT INTO t1 SET f1= 21 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 22 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 21 -------- switch to master ------- CREATE TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW SET @a:=1; SELECT MAX(f1) FROM t1; MAX(f1) 22 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 22 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 22 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 22 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- SHOW TRIGGERS; Trigger Event Table Statement Timing Created sql_mode Definer trg1 INSERT t1 SET @a:=1 BEFORE NULL root@localhost -------- switch to slave ------- SHOW TRIGGERS; Trigger Event Table Statement Timing Created sql_mode Definer trg1 INSERT t1 SET @a:=1 BEFORE NULL root@localhost ######## DROP TRIGGER trg1 ######## -------- switch to master ------- INSERT INTO t1 SET f1= 22 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 23 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 22 -------- switch to master ------- DROP TRIGGER trg1; SELECT MAX(f1) FROM t1; MAX(f1) 23 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 23 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 23 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 23 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- SHOW TRIGGERS; Trigger Event Table Statement Timing Created sql_mode Definer -------- switch to slave ------- SHOW TRIGGERS; Trigger Event Table Statement Timing Created sql_mode Definer ######## CREATE USER user1@localhost ######## -------- switch to master ------- INSERT INTO t1 SET f1= 23 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 24 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 23 -------- switch to master ------- CREATE USER user1@localhost; SELECT MAX(f1) FROM t1; MAX(f1) 24 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 24 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 24 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 24 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- SELECT user FROM mysql.user WHERE user = 'user1'; user user1 -------- switch to slave ------- SELECT user FROM mysql.user WHERE user = 'user1'; user user1 ######## RENAME USER user1@localhost TO rename1@localhost ######## -------- switch to master ------- INSERT INTO t1 SET f1= 24 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 25 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 24 -------- switch to master ------- RENAME USER user1@localhost TO rename1@localhost; SELECT MAX(f1) FROM t1; MAX(f1) 25 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 25 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 25 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 25 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- SELECT user FROM mysql.user WHERE user = 'rename1'; user rename1 -------- switch to slave ------- SELECT user FROM mysql.user WHERE user = 'rename1'; user rename1 ######## DROP USER rename1@localhost ######## -------- switch to master ------- INSERT INTO t1 SET f1= 25 + 1; SELECT MAX(f1) FROM t1; MAX(f1) 26 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 25 -------- switch to master ------- DROP USER rename1@localhost; SELECT MAX(f1) FROM t1; MAX(f1) 26 -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 26 -------- switch to master ------- ROLLBACK; SELECT MAX(f1) FROM t1; MAX(f1) 26 TEST-INFO: MASTER: The INSERT is committed (Succeeded) -------- switch to slave -------- SELECT MAX(f1) FROM t1; MAX(f1) 26 TEST-INFO: SLAVE: The INSERT is committed (Succeeded) -------- switch to master ------- flush logs; -------- switch to slave -------- flush logs; -------- switch to master ------- SELECT user FROM mysql.user WHERE user = 'rename1'; user -------- switch to slave ------- SELECT user FROM mysql.user WHERE user = 'rename1'; user DROP DATABASE IF EXISTS mysqltest1; DROP DATABASE IF EXISTS mysqltest2; DROP DATABASE IF EXISTS mysqltest3; --- New file --- +++ mysql-test/r/rpl_ndb_insert_ignore.result 06/02/15 17:51:06 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; CREATE TABLE t1 ( a int unsigned not null auto_increment primary key, b int unsigned, unique (b) ) ENGINE=NDB; CREATE TABLE t2 ( a int unsigned, # to force INSERT SELECT to have a certain order b int unsigned ) ENGINE=NDB; INSERT INTO t1 VALUES (NULL, 1); INSERT INTO t1 VALUES (NULL, 2); INSERT INTO t1 VALUES (NULL, 3); INSERT INTO t1 VALUES (NULL, 4); INSERT INTO t2 VALUES (1, 1); INSERT INTO t2 VALUES (2, 2); INSERT INTO t2 VALUES (3, 5); INSERT INTO t2 VALUES (4, 3); INSERT INTO t2 VALUES (5, 4); INSERT INTO t2 VALUES (6, 6); INSERT IGNORE INTO t1 SELECT NULL, t2.b FROM t2 ORDER BY t2.a; SELECT * FROM t1 ORDER BY a; a b 1 1 2 2 3 3 4 4 5 5 6 6 SELECT * FROM t1 ORDER BY a; a b 1 1 2 2 3 3 4 4 5 5 6 6 drop table t1; CREATE TABLE t1 ( a int unsigned not null auto_increment primary key, b int unsigned, unique (b) ) ENGINE=myisam; INSERT INTO t1 VALUES (1, 1); INSERT INTO t1 VALUES (2, 2); INSERT INTO t1 VALUES (3, 3); INSERT INTO t1 VALUES (4, 4); INSERT IGNORE INTO t1 SELECT NULL, t2.b FROM t2 ORDER BY t2.a; SELECT * FROM t1 ORDER BY a; a b 1 1 2 2 3 3 4 4 5 5 6 6 SELECT * FROM t1 ORDER BY a; a b 1 1 2 2 3 3 4 4 5 5 6 6 drop table t1, t2; --- New file --- +++ BitKeeper/deleted/.del-rpl_ndb_max_relay_size.result~1e944e2782e270d8 06/02/15 22:42:04 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; stop slave; create table t1 (a int); drop table t1; reset slave; set global max_binlog_size=8192; set global max_relay_log_size=8192-1; select @@global.max_relay_log_size; @@global.max_relay_log_size 4096 start slave; show slave status; Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # 127.0.0.1 root MASTER_PORT 1 master-bin.000001 58664 # # master-bin.000001 Yes Yes # 0 0 58664 # None 0 No # stop slave; reset slave; set global max_relay_log_size=(5*4096); select @@global.max_relay_log_size; @@global.max_relay_log_size 20480 start slave; show slave status; Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # 127.0.0.1 root MASTER_PORT 1 master-bin.000001 58664 # # master-bin.000001 Yes Yes # 0 0 58664 # None 0 No # stop slave; reset slave; set global max_relay_log_size=0; select @@global.max_relay_log_size; @@global.max_relay_log_size 0 start slave; show slave status; Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # 127.0.0.1 root MASTER_PORT 1 master-bin.000001 58664 # # master-bin.000001 Yes Yes # 0 0 58664 # None 0 No # stop slave; reset slave; flush logs; show slave status; Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # 127.0.0.1 root MASTER_PORT 1 4 # # No No # 0 0 0 # None 0 No # reset slave; start slave; flush logs; create table t1 (a int); show slave status; Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # 127.0.0.1 root MASTER_PORT 1 master-bin.000001 58750 # # master-bin.000001 Yes Yes # 0 0 58750 # None 0 No # flush logs; drop table t1; show slave status; Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # 127.0.0.1 root MASTER_PORT 1 master-bin.000001 58826 # # master-bin.000001 Yes Yes # 0 0 58826 # None 0 No # flush logs; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB master-bin.000002 102 <Binlog_Ignore_DB> --- New file --- +++ mysql-test/r/rpl_ndb_multi_update2.result 06/02/15 18:08:04 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; drop table if exists t1,t2; CREATE TABLE t1 ( a int unsigned not null auto_increment primary key, b int unsigned ) ENGINE=NDB; CREATE TABLE t2 ( a int unsigned not null auto_increment primary key, b int unsigned ) ENGINE=NDB; INSERT INTO t1 VALUES (NULL, 0); INSERT INTO t1 SELECT NULL, 0 FROM t1; INSERT INTO t2 VALUES (NULL, 0), (NULL,1); SELECT * FROM t1 ORDER BY a; a b 1 0 2 0 SELECT * FROM t2 ORDER BY a; a b 1 0 2 1 UPDATE t1, t2 SET t1.b = (t2.b+4) WHERE t1.a = t2.a; SELECT * FROM t1 ORDER BY a; a b 1 4 2 5 SELECT * FROM t2 ORDER BY a; a b 1 0 2 1 SELECT * FROM t1 ORDER BY a; a b 1 4 2 5 SELECT * FROM t2 ORDER BY a; a b 1 0 2 1 drop table t1,t2; reset master; CREATE TABLE t1 ( a INT ); INSERT INTO t1 VALUES (0); UPDATE t1, (SELECT 3 as b) AS x SET t1.a = x.b; select * from t1; a 3 select * from t1; a 3 drop table t1; --- New file --- +++ mysql-test/r/rpl_ndb_multi_update3.result 06/02/15 18:21:08 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; -------- Test for BUG#9361 -------- CREATE TABLE t1 ( a int unsigned not null auto_increment primary key, b int unsigned ) ENGINE=NDB; CREATE TABLE t2 ( a int unsigned not null auto_increment primary key, b int unsigned ) ENGINE=NDB; INSERT INTO t1 VALUES (NULL, 0); INSERT INTO t1 SELECT NULL, 0 FROM t1; INSERT INTO t2 VALUES (NULL, 0), (NULL,1); SELECT * FROM t1 ORDER BY a; a b 1 0 2 0 SELECT * FROM t2 ORDER BY a; a b 1 0 2 1 UPDATE t2, (SELECT a FROM t1) AS t SET t2.b = t.a+5 ; SELECT * FROM t1 ORDER BY a; a b 1 0 2 0 SELECT * FROM t2 ORDER BY a; a b 1 6 2 6 SELECT * FROM t1 ORDER BY a; a b 1 0 2 0 SELECT * FROM t2 ORDER BY a; a b 1 6 2 6 drop table t1,t2; -------- Test 1 for BUG#9361 -------- DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t2; CREATE TABLE t1 ( a1 char(30), a2 int, a3 int, a4 char(30), a5 char(30) ); CREATE TABLE t2 ( b1 int, b2 char(30) ); INSERT INTO t1 VALUES ('Yes', 1, NULL, 'foo', 'bar'); INSERT INTO t2 VALUES (1, 'baz'); UPDATE t1 a, t2 SET a.a1 = 'No' WHERE a.a2 = (SELECT b1 FROM t2 WHERE b2 = 'baz') AND a.a3 IS NULL AND a.a4 = 'foo' AND a.a5 = 'bar'; SELECT * FROM t1; a1 a2 a3 a4 a5 No 1 NULL foo bar SELECT * FROM t2; b1 b2 1 baz DROP TABLE t1, t2; -------- Test 2 for BUG#9361 -------- DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t2; DROP TABLE IF EXISTS t3; CREATE TABLE t1 ( i INT, j INT, x INT, y INT, z INT ); CREATE TABLE t2 ( i INT, k INT, x INT, y INT, z INT ); CREATE TABLE t3 ( j INT, k INT, x INT, y INT, z INT ); INSERT INTO t1 VALUES ( 1, 2,13,14,15); INSERT INTO t2 VALUES ( 1, 3,23,24,25); INSERT INTO t3 VALUES ( 2, 3, 1,34,35), ( 2, 3, 1,34,36); UPDATE t1 AS a INNER JOIN t2 AS b ON a.i = b.i INNER JOIN t3 AS c ON a.j = c.j AND b.k = c.k SET a.x = b.x, a.y = b.y, a.z = ( SELECT sum(z) FROM t3 WHERE y = 34 ) WHERE b.x = 23; SELECT * FROM t1; i j x y z 1 2 23 24 71 DROP TABLE t1, t2, t3; DROP TABLE IF EXISTS t1; Warnings: Note 1051 Unknown table 't1' DROP TABLE IF EXISTS t2; Warnings: Note 1051 Unknown table 't2' CREATE TABLE t1 ( idp int(11) NOT NULL default '0', idpro int(11) default NULL, price decimal(19,4) default NULL, PRIMARY KEY (idp) ); CREATE TABLE t2 ( idpro int(11) NOT NULL default '0', price decimal(19,4) default NULL, nbprice int(11) default NULL, PRIMARY KEY (idpro) ); INSERT INTO t1 VALUES (1,1,'3.0000'), (2,2,'1.0000'), (3,1,'1.0000'), (4,1,'4.0000'), (5,3,'2.0000'), (6,2,'4.0000'); INSERT INTO t2 VALUES (1,'0.0000',0), (2,'0.0000',0), (3,'0.0000',0); update t2 join ( select idpro, min(price) as min_price, count(*) as nbr_price from t1 where idpro>0 and price>0 group by idpro ) as table_price on t2.idpro = table_price.idpro set t2.price = table_price.min_price, t2.nbprice = table_price.nbr_price; select "-- MASTER AFTER JOIN --" as ""; -- MASTER AFTER JOIN -- select * from t1; idp idpro price 1 1 3.0000 2 2 1.0000 3 1 1.0000 4 1 4.0000 5 3 2.0000 6 2 4.0000 select * from t2; idpro price nbprice 1 1.0000 3 2 1.0000 2 3 2.0000 1 select "-- SLAVE AFTER JOIN --" as ""; -- SLAVE AFTER JOIN -- select * from t1; idp idpro price 1 1 3.0000 2 2 1.0000 3 1 1.0000 4 1 4.0000 5 3 2.0000 6 2 4.0000 select * from t2; idpro price nbprice 1 1.0000 3 2 1.0000 2 3 2.0000 1 --- New file --- +++ mysql-test/r/rpl_ndb_relayrotate.result 06/02/15 18:40:37 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; stop slave; create table t1 (a int) engine=NDB; reset slave; start slave; stop slave; start slave; select max(a) from t1; max(a) 8000 drop table t1; --- New file --- +++ mysql-test/r/rpl_ndb_row_001.result 06/02/15 21:36:29 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; CREATE TABLE t1 (word CHAR(20) NOT NULL); LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1; LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/std_data/words.dat' INTO TABLE t1; SELECT * FROM t1 ORDER BY word LIMIT 10; word Aarhus Aarhus Aarhus Aarhus Aaron Aaron Aaron Aaron Ababa Ababa STOP SLAVE; SET PASSWORD FOR root@"localhost" = PASSWORD('foo'); START SLAVE; SET PASSWORD FOR root@"localhost" = PASSWORD(''); CREATE TABLE t3(n INT); INSERT INTO t3 VALUES(1),(2); SELECT * FROM t3 ORDER BY n; n 1 2 SELECT SUM(LENGTH(word)) FROM t1; SUM(LENGTH(word)) 1022 DROP TABLE t1,t3; CREATE TABLE t1 (n INT) ENGINE=NDB; RESET MASTER; STOP SLAVE; RESET SLAVE; SELECT COUNT(*) FROM t1; COUNT(*) 5000 LOCK TABLES t1 READ; START SLAVE; UNLOCK TABLES; SELECT COUNT(*) FROM t1; COUNT(*) 5000 DROP TABLE t1; CREATE TABLE t1 (n INT); INSERT INTO t1 VALUES(3456); SELECT n FROM t1; n 3456 DROP TABLE t1; --- 1.1/mysql-test/t/rpl_insert_id_pk.test 2006-02-08 16:44:07 +01:00 +++ 1.2/mysql-test/t/rpl_insert_id_pk.test 2006-02-15 18:58:22 +01:00 @@ -1,6 +1,11 @@ ################################# # Wrapper for rpl_insert_id.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_innodb.inc let $engine_type=innodb; -- source extra/rpl_tests/rpl_insert_id_pk.test --- New file --- +++ mysql-test/t/rpl_ndb_UUID.test 06/02/15 21:44:21 ######################################################## # By JBM 2005-02-15 Wrapped to allow reuse of test code# ######################################################## --source include/have_ndb.inc let $engine_type=NDB; --source extra/rpl_tests/rpl_row_UUID.test --- New file --- +++ mysql-test/t/rpl_ndb_charset.test 06/02/15 22:10:50 ######################################################## # By JBM 2005-02-15 Wrapped to allow reuse of test code# ######################################################## --source include/have_ndb.inc let $engine_type=NDB; -- source extra/rpl_tests/rpl_row_charset.test --- New file --- +++ mysql-test/t/rpl_ndb_commit_afterflush.test 06/02/15 16:39:16 ##################################### # Wrapper for rpl_commit_after_flush# # Wrapped to reuse test code on # # Different engines # # By JBM 2004-02-15 # ##################################### -- source include/have_ndb.inc let $engine_type=NDB; -- source extra/rpl_tests/rpl_commit_after_flush.test --- New file --- +++ mysql-test/t/rpl_ndb_ddl.test 06/02/15 16:57:20 ######################## rpl_ddl.test ######################## # # # DDL statements (sometimes with implicit COMMIT) executed # # by the master and it's propagation into the slave # # # ############################################################## # # NOTE, PLEASE BE CAREFUL, WHEN MODIFYING THE TESTS !! # # 1. !All! objects to be dropped, renamed, altered ... must be created # in AUTOCOMMIT= 1 mode before AUTOCOMMIT is set to 0 and the test # sequences start. # # 2. Never use a test object, which was direct or indirect affected by a # preceeding test sequence again. # Except table d1.t1 where ONLY DML is allowed. # # If one preceeding test sequence hits a (sometimes not good visible, # because the sql error code of the statement might be 0) bug # and these rules are ignored, a following test sequence might earn ugly # effects like failing 'sync_slave_with_master', crashes of the slave or # abort of the test case etc.. # # 3. The assignment of the DDL command to be tested to $my_stmt can # be a bit difficult. "'" must be avoided, because the test # routine "include/rpl_stmt_seq.inc" performs a # eval SELECT CONCAT('######## ','$my_stmt',' ########') as ""; # --source include/have_ndb.inc --source include/master-slave.inc let $engine_type= "NDB"; -- source extra/rpl_tests/rpl_ddl.test --- New file --- +++ mysql-test/t/rpl_ndb_insert_ignore.test 06/02/15 17:50:49 ##################################### # Wrapper for rpl_insert_ignore.test# ##################################### -- source include/have_ndb.inc let $engine_type=NDB; let $engine_type2=myisam; -- source extra/rpl_tests/rpl_insert_ignore.test --- New file --- +++ BitKeeper/deleted/.del-rpl_ndb_max_relay_size.test~afa6834a51627676 06/02/15 22:41:43 # Test of options max_binlog_size and max_relay_log_size and # how they act (if max_relay_log_size == 0, use max_binlog_size # for relay logs too). # Test of manual relay log rotation with FLUSH LOGS. # Requires statement logging -- source include/have_ndb.inc -- source include/have_binlog_format_row.inc -- source extra/rpl_tests/rpl_max_relay_size.test --- New file --- +++ mysql-test/t/rpl_ndb_multi_update2-slave.opt 06/02/15 18:07:39 --replicate-ignore-table=nothing.sensible --- New file --- +++ mysql-test/t/rpl_ndb_multi_update2.test 06/02/15 18:07:06 ############################################################ # By JBM 2006-02-15 Wrapper for rpl_multi_update2.test # # to reuse test code between engine runs # ############################################################ -- source include/have_ndb.inc let $engine_type=NDB; --source extra/rpl_tests/rpl_multi_update2.test --- New file --- +++ mysql-test/t/rpl_ndb_multi_update3.test 06/02/15 18:20:56 ############################################################ # By JBM 2006-02-15 Wrapper for rpl_multi_update3.test # # to reuse test code between engine runs # ############################################################ -- source include/have_ndb.inc let $engine_type=NDB; -- source extra/rpl_tests/rpl_multi_update3.test --- New file --- +++ mysql-test/t/rpl_ndb_relayrotate-slave.opt 06/02/15 18:39:48 -O max_relay_log_size=16384 --innodb --log-warnings --- New file --- +++ mysql-test/t/rpl_ndb_relayrotate.test 06/02/15 18:39:22 ############################################################ # By JBM 2006-02-15 Wrapper for rpl_relayrotate.test # # to reuse test code between engine runs # ############################################################ -- source include/have_ndb.inc -- source include/have_ndb_extra.inc let $engine_type=NDB; -- source extra/rpl_tests/rpl_relayrotate.test --- New file --- +++ mysql-test/t/rpl_ndb_row_001.test 06/02/15 21:35:59 ######################################################## # By JBM 2005-02-15 Wrapped to allow reuse of test code# ######################################################## --source include/have_ndb.inc let $engine_type=NDB; -- source extra/rpl_tests/rpl_row_001.test --- 1.2/mysql-test/t/rpl_relay_space_innodb.test 2006-02-03 13:16:20 +01:00 +++ 1.3/mysql-test/t/rpl_relay_space_innodb.test 2006-02-15 19:00:22 +01:00 @@ -15,6 +15,7 @@ #Change Date: 2006-02-03 # #Change: Added Comments # ################################### +-- source include/not_ndb_default.inc -- source include/have_innodb.inc let $engine_type=InnoDB; -- source extra/rpl_tests/rpl_sv_relay_space.test --- 1.2/mysql-test/t/rpl_relay_space_myisam.test 2006-02-03 13:01:40 +01:00 +++ 1.3/mysql-test/t/rpl_relay_space_myisam.test 2006-02-15 18:48:15 +01:00 @@ -15,6 +15,7 @@ #Change Date: 2006-02-03 # #Change: Added Comments # ################################### +-- source include/not_ndb_default.inc let $engine_type=MyISAM; -- source extra/rpl_tests/rpl_sv_relay_space.test --- 1.2/mysql-test/t/rpl_row_blob_innodb.test 2006-02-08 02:45:35 +01:00 +++ 1.3/mysql-test/t/rpl_row_blob_innodb.test 2006-02-15 19:01:01 +01:00 @@ -1,6 +1,11 @@ ################################# # Wrapper for rpl_row_blob.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_innodb.inc let $engine_type=InnoDB; -- source extra/rpl_tests/rpl_row_blob.test --- 1.1/mysql-test/t/rpl_row_blob_myisam.test 2006-01-05 03:54:53 +01:00 +++ 1.2/mysql-test/t/rpl_row_blob_myisam.test 2006-02-15 18:49:33 +01:00 @@ -1,6 +1,11 @@ ################################# # Wrapper for rpl_row_blob.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 let $engine_type=myisam; -- source extra/rpl_tests/rpl_row_blob.test --- 1.1/mysql-test/t/rpl_row_log.test 2006-02-06 23:05:58 +01:00 +++ 1.2/mysql-test/t/rpl_row_log.test 2006-02-15 18:51:37 +01:00 @@ -5,6 +5,11 @@ # Same test. NDB produced a diff # # bin-log # ################################### +######################################################## +# 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 let $engine_type=MyISAM; -- source extra/rpl_tests/rpl_log.test --- 1.1/mysql-test/t/rpl_row_log_innodb.test 2006-02-06 23:06:42 +01:00 +++ 1.2/mysql-test/t/rpl_row_log_innodb.test 2006-02-15 19:02:38 +01:00 @@ -5,6 +5,7 @@ # Same test. NDB produced a diff # # bin-log # ################################### +-- source include/not_ndb_default.inc -- source include/have_binlog_format_row.inc -- source include/have_innodb.inc let $engine_type=InnoDB; --- 1.69/mysql-test/t/disabled.def 2006-02-15 14:36:22 +01:00 +++ 1.72/mysql-test/t/disabled.def 2006-02-16 03:27:11 +01:00 @@ -27,7 +27,11 @@ rpl_ddl : Bug#15963 SBR does not show "Definer" correctly rpl_ndb_auto_inc : Bug#17086 rpl_ndb_basic : Bug#16228 [IN REVIEW] -rpl_ndb_delete_nowhere : Bug#17400: Cluster Replication: delete of rows in table without pk fails +rpl_ndb_charset : Bug#17246 +rpl_ndb_ddl : Bug#17400: delete & update of rows in table without pk fails +rpl_ndb_delete_nowhere : Bug#17400: delete & update of rows in table without pk fails +rpl_ndb_multi_update3 : Bug#17400: delete & update of rows in table without pk fails +rpl_ndb_insert_ignore : Bugs: #17431: INSERT IGNORE INTO returns failed: 1296 rpl_ndb_relay_space : Bug#16993 rpl_ndb_sp007 : Bug #17290 rpl_sp : Bug#16456 --- 1.1/mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test 2005-12-22 06:34:50 +01:00 +++ 1.2/mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test 2006-02-15 21:52:06 +01:00 @@ -9,14 +9,14 @@ eval create table t1(a int not null primary key) engine=$engine_type; insert delayed into t1 values (1),(2),(3); flush tables; -select * from t1; +SELECT * FROM t1 ORDER BY a; sync_slave_with_master; connection master; --replace_result $VERSION VERSION show binlog events; sync_slave_with_master; -select * from t1; +SELECT * FROM t1 ORDER BY a; connection master; drop table t1; sync_slave_with_master; --- 1.1/mysql-test/r/rpl_row_delayed_ins.result 2005-12-22 06:34:52 +01:00 +++ 1.2/mysql-test/r/rpl_row_delayed_ins.result 2006-02-15 21:52:21 +01:00 @@ -7,7 +7,7 @@ create table t1(a int not null primary key) engine=myisam; insert delayed into t1 values (1),(2),(3); flush tables; -select * from t1; +SELECT * FROM t1 ORDER BY a; a 1 2 @@ -19,7 +19,7 @@ master-bin.000001 222 Table_map 1 261 test.t1 master-bin.000001 261 Write_rows 1 305 master-bin.000001 305 Query 1 380 use `test`; flush tables -select * from t1; +SELECT * FROM t1 ORDER BY a; a 1 2 --- 1.1/mysql-test/r/rpl_row_sp008.result 2005-12-22 06:34:55 +01:00 +++ 1.2/mysql-test/r/rpl_row_sp008.result 2006-02-15 22:51:53 +01:00 @@ -29,17 +29,5 @@ SELECT * FROM test.t2; a 2 -show binlog events; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 102 Server ver: VERSION, Binlog ver: 4 -master-bin.000001 102 Query 1 193 use `test`; DROP TABLE IF EXISTS test.t2 -master-bin.000001 193 Query 1 299 use `test`; CREATE TABLE test.t1 (a INT,PRIMARY KEY(a)) -master-bin.000001 299 Query 1 405 use `test`; CREATE TABLE test.t2 (a INT,PRIMARY KEY(a)) -master-bin.000001 405 Table_map 1 444 test.t1 -master-bin.000001 444 Write_rows 1 483 -master-bin.000001 483 Table_map 1 540 mysql.proc -master-bin.000001 540 Write_rows 1 723 -master-bin.000001 723 Table_map 1 762 test.t2 -master-bin.000001 762 Write_rows 1 796 DROP PROCEDURE IF EXISTS test.p1; DROP TABLE IF EXISTS test.t1; --- 1.1/mysql-test/t/rpl_deadlock_innodb.test 2005-12-22 06:34:59 +01:00 +++ 1.2/mysql-test/t/rpl_deadlock_innodb.test 2006-02-15 18:54:39 +01:00 @@ -1,6 +1,11 @@ ################################ # Wrapper for rpl_deadlock.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_innodb.inc let $engine_type=innodb; -- source extra/rpl_tests/rpl_deadlock.test --- 1.3/mysql-test/t/rpl_foreign_key_innodb.test 2006-01-20 17:38:14 +01:00 +++ 1.4/mysql-test/t/rpl_foreign_key_innodb.test 2006-02-15 18:56:03 +01:00 @@ -5,6 +5,7 @@ # Change Date: 2006-01-17 # Change: FK not supported, skip test when NDB is forced #################################### +-- source include/not_ndb_default.inc -- source include/have_innodb.inc let $engine_type=INNODB; -- source extra/rpl_tests/rpl_foreign_key.test --- 1.1/mysql-test/t/rpl_row_001.test 2005-12-22 06:35:00 +01:00 +++ 1.2/mysql-test/t/rpl_row_001.test 2006-02-15 18:48:57 +01:00 @@ -1,2 +1,7 @@ +######################################################## +# 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 let $engine_type=MYISAM; -- source extra/rpl_tests/rpl_row_001.test --- 1.1/mysql-test/t/rpl_row_UUID.test 2005-12-22 06:35:00 +01:00 +++ 1.2/mysql-test/t/rpl_row_UUID.test 2006-02-15 18:52:09 +01:00 @@ -1,2 +1,7 @@ +######################################################## +# 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 let $engine_type=myisam; --source extra/rpl_tests/rpl_row_UUID.test --- 1.1/mysql-test/t/rpl_row_charset.test 2005-12-22 06:35:00 +01:00 +++ 1.2/mysql-test/t/rpl_row_charset.test 2006-02-15 18:50:06 +01:00 @@ -1,2 +1,7 @@ +######################################################## +# 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 let $engine_type=myisam; -- source extra/rpl_tests/rpl_row_charset.test --- 1.1/mysql-test/t/rpl_row_delayed_ins.test 2005-12-22 06:35:01 +01:00 +++ 1.2/mysql-test/t/rpl_row_delayed_ins.test 2006-02-15 18:50:51 +01:00 @@ -1,2 +1,7 @@ +######################################################## +# 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 let $engine_type=myisam; -- source extra/rpl_tests/rpl_row_delayed_ins.test --- 1.1/mysql-test/t/rpl_row_func003.test 2005-12-22 06:35:02 +01:00 +++ 1.2/mysql-test/t/rpl_row_func003.test 2006-02-15 19:01:47 +01:00 @@ -1,6 +1,11 @@ ################################### # Wrapper for rpl_row_func003.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_innodb.inc let $engine_type=INNODB; -- source extra/rpl_tests/rpl_row_func003.test --- 1.1/mysql-test/t/rpl_row_max_relay_size.test 2005-12-22 06:35:03 +01:00 +++ 1.2/mysql-test/t/rpl_row_max_relay_size.test 2006-02-15 22:41:16 +01:00 @@ -4,6 +4,7 @@ # Test of manual relay log rotation with FLUSH LOGS. # Requires statement logging +-- source include/not_ndb_default.inc -- source include/have_binlog_format_row.inc -- source extra/rpl_tests/rpl_max_relay_size.test --- 1.1/mysql-test/t/rpl_row_sp002_innodb.test 2005-12-22 06:35:04 +01:00 +++ 1.2/mysql-test/t/rpl_row_sp002_innodb.test 2006-02-15 19:03:23 +01:00 @@ -1,6 +1,11 @@ ################################# # Wrapper for rpl_row_sp002.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_innodb.inc let $engine_type=INNODB; -- source extra/rpl_tests/rpl_row_sp002.test --- 1.1/mysql-test/t/rpl_row_sp003.test 2005-12-22 06:35:04 +01:00 +++ 1.2/mysql-test/t/rpl_row_sp003.test 2006-02-15 19:04:15 +01:00 @@ -1,6 +1,11 @@ ################################# # Wrapper for rpl_row_sp003.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_innodb.inc let $engine_type=INNODB; -- source extra/rpl_tests/rpl_row_sp003.test --- 1.1/mysql-test/t/rpl_row_sp006_InnoDB.test 2005-12-22 06:35:04 +01:00 +++ 1.2/mysql-test/t/rpl_row_sp006_InnoDB.test 2006-02-15 19:04:52 +01:00 @@ -1,6 +1,11 @@ ################################# # Wrapper for rpl_row_sp006.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_innodb.inc let $engine_type=InnoDB; -- source extra/rpl_tests/rpl_row_sp006.test --- 1.1/mysql-test/t/rpl_row_sp007_innodb.test 2005-12-22 06:35:04 +01:00 +++ 1.2/mysql-test/t/rpl_row_sp007_innodb.test 2006-02-15 19:05:38 +01:00 @@ -1,6 +1,11 @@ ################################# # Wrapper for rpl_row_sp007.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_innodb.inc let $engine_type=INNODB; -- source extra/rpl_tests/rpl_row_sp007.test --- 1.2/mysql-test/t/rpl_row_sp008.test 2006-02-13 19:02:24 +01:00 +++ 1.3/mysql-test/t/rpl_row_sp008.test 2006-02-15 22:51:34 +01:00 @@ -46,11 +46,6 @@ sync_with_master; SELECT * FROM test.t2; -connection master; -let $VERSION=`select version()`; ---replace_result $VERSION VERSION -show binlog events; - # Cleanup connection master; --- 1.1/mysql-test/t/rpl_row_until.test 2005-12-22 06:35:06 +01:00 +++ 1.2/mysql-test/t/rpl_row_until.test 2006-02-15 22:18:31 +01:00 @@ -1,3 +1,4 @@ +-- source include/not_ndb_default.inc -- source include/have_binlog_format_row.inc -- source include/master-slave.inc --- 1.3/mysql-test/t/rpl_ddl.test 2005-12-23 14:26:33 +01:00 +++ 1.4/mysql-test/t/rpl_ddl.test 2006-02-15 16:56:51 +01:00 @@ -24,10 +24,10 @@ # # 3. The assignment of the DDL command to be tested to $my_stmt can # be a bit difficult. "'" must be avoided, because the test -# routine "include/rpl_stmt_seq.inc" performs a +# routine "include/rpl_stmt_seq.inc" performs a # eval SELECT CONCAT('######## ','$my_stmt',' ########') as ""; # - +--source include/not_ndb_default.inc --source include/have_innodb.inc --source include/master-slave.inc let $engine_type= "InnoDB"; --- 1.4/mysql-test/t/rpl_failed_optimize.test 2006-02-07 17:20:41 +01:00 +++ 1.5/mysql-test/t/rpl_failed_optimize.test 2006-02-15 18:55:16 +01:00 @@ -1,6 +1,11 @@ ####################################### # Wrapper for rpl_failed_optimize.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_innodb.inc let $engine_type=InnoDB; -- source extra/rpl_tests/rpl_failed_optimize.test --- 1.3/mysql-test/r/rpl_row_basic_11bugs.result 2006-01-12 19:50:30 +01:00 +++ 1.4/mysql-test/r/rpl_row_basic_11bugs.result 2006-02-15 22:59:42 +01:00 @@ -25,11 +25,6 @@ Tables_in_test_ignore t2 INSERT INTO t2 VALUES (3,3), (4,4); -SHOW BINLOG EVENTS FROM 102; -Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 102 Query 1 195 use `test`; CREATE TABLE t1 (a INT, b INT) -master-bin.000001 195 Table_map 1 235 test.t1 -master-bin.000001 235 Write_rows 1 282 **** On Slave **** SHOW DATABASES; Database --- 1.2/mysql-test/t/rpl_row_basic_11bugs.test 2006-01-11 09:16:19 +01:00 +++ 1.3/mysql-test/t/rpl_row_basic_11bugs.test 2006-02-15 22:59:30 +01:00 @@ -17,7 +17,7 @@ CREATE TABLE t2 (a INT, b INT); SHOW TABLES; INSERT INTO t2 VALUES (3,3), (4,4); -SHOW BINLOG EVENTS FROM 102; +#SHOW BINLOG EVENTS FROM 102; sync_slave_with_master; --echo **** On Slave **** SHOW DATABASES; --- 1.15/mysql-test/t/rpl_insert_id.test 2006-02-07 17:20:41 +01:00 +++ 1.16/mysql-test/t/rpl_insert_id.test 2006-02-15 18:59:03 +01:00 @@ -1,6 +1,11 @@ ################################# # Wrapper for rpl_insert_id.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_innodb.inc let $engine_type=innodb; -- source extra/rpl_tests/rpl_insert_id.test --- 1.25/mysql-test/t/rpl_loaddata.test 2006-02-07 20:54:34 +01:00 +++ 1.26/mysql-test/t/rpl_loaddata.test 2006-02-15 18:46:00 +01:00 @@ -1,2 +1,7 @@ +######################################################## +# 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 let $engine_type=MyISAM; -- source extra/rpl_tests/rpl_loaddata.test --- 1.3/mysql-test/t/rpl_auto_increment.test 2005-12-22 05:10:58 +01:00 +++ 1.4/mysql-test/t/rpl_auto_increment.test 2006-02-15 18:53:15 +01:00 @@ -1,6 +1,11 @@ ##################################### # Wrapper for rpl_auto_increment.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_innodb.inc let $engine_type=innodb; let $engine_type2=myisam;
| Thread | ||
|---|---|---|
| • bk commit into 5.1 tree (jmiller:1.2113) | Jonathan Miller | 16 Feb |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 1.085 sec. using MySQL 5.1.14-beta-log