| List: | Internals | « Previous MessageNext Message » | |
| From: | Jonathan Miller | Date: | October 20 2005 10:39pm |
| Subject: | bk commit into 5.0 tree (jmiller:1.2022) | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 5.0 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.2022 05/10/20 22:39:25 jmiller@stripped +36 -0 Last part of replication tests upgrade to use the engine_type var mysql-test/extra/rpl_tests/rpl_stm_EE_err.test 1.11 05/10/20 22:38:27 jmiller@stripped +2 -2 Updated mysql-test/t/rpl_stm_EE_err.test 1.1 05/10/20 22:38:17 jmiller@stripped +2 -0 wrapper mysql-test/t/rpl_stm_EE_err.test 1.0 05/10/20 22:38:17 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/rpl_stm_EE_err.test mysql-test/extra/rpl_tests/rpl_stm_EE_err.test 1.10 05/10/20 22:35:57 jmiller@stripped +0 -0 Rename: mysql-test/t/rpl_stm_EE_err.test -> mysql-test/extra/rpl_tests/rpl_stm_EE_err.test mysql-test/extra/rpl_tests/rpl_stm_charset.test 1.20 05/10/20 22:35:31 jmiller@stripped +2 -2 Updated mysql-test/t/rpl_stm_charset.test 1.1 05/10/20 22:35:21 jmiller@stripped +2 -0 wrapper mysql-test/t/rpl_stm_charset.test 1.0 05/10/20 22:35:21 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/rpl_stm_charset.test mysql-test/extra/rpl_tests/rpl_stm_charset.test 1.19 05/10/20 22:33:00 jmiller@stripped +0 -0 Rename: mysql-test/t/rpl_stm_charset.test -> mysql-test/extra/rpl_tests/rpl_stm_charset.test mysql-test/extra/rpl_tests/rpl_stm_000001.test 1.44 05/10/20 22:31:55 jmiller@stripped +1 -1 Updated mysql-test/t/rpl_stm_000001.test 1.1 05/10/20 22:31:46 jmiller@stripped +2 -0 wrapper mysql-test/t/rpl_stm_000001.test 1.0 05/10/20 22:31:45 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/rpl_stm_000001.test mysql-test/extra/rpl_tests/rpl_stm_000001.test 1.43 05/10/20 22:28:41 jmiller@stripped +0 -0 Rename: mysql-test/t/rpl_stm_000001.test -> mysql-test/extra/rpl_tests/rpl_stm_000001.test mysql-test/extra/rpl_tests/rpl_row_UUID.test 1.9 05/10/20 22:28:00 jmiller@stripped +1 -1 Updated mysql-test/t/rpl_row_UUID.test 1.1 05/10/20 22:27:45 jmiller@stripped +2 -0 wrapper mysql-test/t/rpl_row_UUID.test 1.0 05/10/20 22:27:45 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/rpl_row_UUID.test mysql-test/extra/rpl_tests/rpl_row_UUID.test 1.8 05/10/20 22:25:29 jmiller@stripped +0 -0 Rename: mysql-test/t/rpl_row_UUID.test -> mysql-test/extra/rpl_tests/rpl_row_UUID.test mysql-test/extra/rpl_tests/rpl_row_multi_update3.test 1.4 05/10/20 22:24:53 jmiller@stripped +4 -4 Updated mysql-test/t/rpl_row_multi_update3.test 1.1 05/10/20 22:24:37 jmiller@stripped +2 -0 wrapper mysql-test/t/rpl_row_multi_update3.test 1.0 05/10/20 22:24:37 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/rpl_row_multi_update3.test mysql-test/extra/rpl_tests/rpl_row_multi_update3.test 1.3 05/10/20 22:21:31 jmiller@stripped +0 -0 Rename: mysql-test/t/rpl_row_multi_update3.test -> mysql-test/extra/rpl_tests/rpl_row_multi_update3.test mysql-test/extra/rpl_tests/rpl_row_EE_err.test 1.5 05/10/20 22:20:58 jmiller@stripped +2 -2 Updated mysql-test/t/rpl_row_EE_err.test 1.1 05/10/20 22:20:47 jmiller@stripped +2 -0 wrapper mysql-test/t/rpl_row_EE_err.test 1.0 05/10/20 22:20:47 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/rpl_row_EE_err.test mysql-test/extra/rpl_tests/rpl_row_EE_err.test 1.4 05/10/20 22:18:02 jmiller@stripped +0 -0 Rename: mysql-test/t/rpl_row_EE_err.test -> mysql-test/extra/rpl_tests/rpl_row_EE_err.test mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test 1.9 05/10/20 22:17:32 jmiller@stripped +1 -1 Updated mysql-test/t/rpl_row_delayed_ins.test 1.1 05/10/20 22:17:20 jmiller@stripped +2 -0 wrapper mysql-test/t/rpl_row_delayed_ins.test 1.0 05/10/20 22:17:20 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/rpl_row_delayed_ins.test mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test 1.8 05/10/20 22:09:37 jmiller@stripped +0 -0 Rename: mysql-test/t/rpl_row_delayed_ins.test -> mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test mysql-test/extra/rpl_tests/rpl_row_charset.test 1.6 05/10/20 22:09:07 jmiller@stripped +2 -2 Updated mysql-test/t/rpl_row_charset.test 1.1 05/10/20 22:08:54 jmiller@stripped +2 -0 wrapper mysql-test/t/rpl_row_charset.test 1.0 05/10/20 22:08:54 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/rpl_row_charset.test mysql-test/extra/rpl_tests/rpl_row_charset.test 1.5 05/10/20 22:06:17 jmiller@stripped +0 -0 Rename: mysql-test/t/rpl_row_charset.test -> mysql-test/extra/rpl_tests/rpl_row_charset.test mysql-test/extra/rpl_tests/rpl_row_001.test 1.6 05/10/20 22:05:29 jmiller@stripped +1 -1 Updated mysql-test/t/rpl_row_001.test 1.1 05/10/20 22:05:16 jmiller@stripped +2 -0 wrapper mysql-test/t/rpl_row_001.test 1.0 05/10/20 22:05:16 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/rpl_row_001.test mysql-test/extra/rpl_tests/rpl_row_001.test 1.5 05/10/20 22:01:52 jmiller@stripped +0 -0 Rename: mysql-test/t/rpl_row_001.test -> mysql-test/extra/rpl_tests/rpl_row_001.test mysql-test/extra/rpl_tests/rpl_multi_update.test 1.13 05/10/20 22:00:56 jmiller@stripped +4 -4 Updated mysql-test/t/rpl_multi_update.test 1.1 05/10/20 22:00:38 jmiller@stripped +2 -0 wrapper mysql-test/t/rpl_multi_update.test 1.0 05/10/20 22:00:38 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/rpl_multi_update.test mysql-test/extra/rpl_tests/rpl_multi_update.test 1.12 05/10/20 21:58:00 jmiller@stripped +0 -0 Rename: mysql-test/t/rpl_multi_update.test -> mysql-test/extra/rpl_tests/rpl_multi_update.test mysql-test/extra/rpl_tests/rpl_multi_update3.test 1.9 05/10/20 21:57:47 jmiller@stripped +4 -4 Updated mysql-test/t/rpl_multi_update3.test 1.1 05/10/20 21:57:39 jmiller@stripped +2 -0 wrapper mysql-test/t/rpl_multi_update3.test 1.0 05/10/20 21:57:39 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/rpl_multi_update3.test mysql-test/extra/rpl_tests/rpl_multi_update3.test 1.8 05/10/20 21:54:43 jmiller@stripped +0 -0 Rename: mysql-test/t/rpl_multi_update3.test -> mysql-test/extra/rpl_tests/rpl_multi_update3.test mysql-test/extra/rpl_tests/rpl_multi_update2.test 1.7 05/10/20 21:53:50 jmiller@stripped +4 -4 Updated mysql-test/t/rpl_multi_update2.test 1.1 05/10/20 21:53:22 jmiller@stripped +2 -0 wrapper mysql-test/t/rpl_multi_update2.test 1.0 05/10/20 21:53:22 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/rpl_multi_update2.test mysql-test/extra/rpl_tests/rpl_multi_update2.test 1.6 05/10/20 21:50:26 jmiller@stripped +0 -0 Rename: mysql-test/t/rpl_multi_update2.test -> mysql-test/extra/rpl_tests/rpl_multi_update2.test mysql-test/extra/rpl_tests/rpl_loaddata.test 1.22 05/10/20 21:45:21 jmiller@stripped +2 -2 Updated for engine_type var mysql-test/t/rpl_loaddata.test 1.1 05/10/20 21:45:03 jmiller@stripped +2 -0 wrapper mysql-test/t/rpl_loaddata.test 1.0 05/10/20 21:45:03 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/rpl_loaddata.test mysql-test/extra/rpl_tests/rpl_loaddata.test 1.21 05/10/20 21:40:04 jmiller@stripped +0 -0 Rename: mysql-test/t/rpl_loaddata.test -> mysql-test/extra/rpl_tests/rpl_loaddata.test mysql-test/extra/rpl_tests/rpl_delete_no_where.test 1.3 05/10/20 21:38:35 jmiller@stripped +2 -2 Updated for engine_type var mysql-test/t/rpl_delete_no_where.test 1.1 05/10/20 21:37:55 jmiller@stripped +2 -0 wrapper mysql-test/t/rpl_delete_no_where.test 1.0 05/10/20 21:37:55 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/rpl_delete_no_where.test mysql-test/extra/rpl_tests/rpl_delete_no_where.test 1.2 05/10/20 21:34:48 jmiller@stripped +0 -0 Rename: mysql-test/t/rpl_delete_no_where.test -> mysql-test/extra/rpl_tests/rpl_delete_no_where.test mysql-test/t/rpl000006.test 1.2 05/10/20 21:33:52 jmiller@stripped +1 -0 wrapper mysql-test/t/rpl000006.test 1.1 05/10/20 21:31:23 jmiller@stripped +1 -0 wrapper mysql-test/t/rpl000006.test 1.0 05/10/20 21:31:23 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/rpl000006.test mysql-test/extra/rpl_tests/rpl000006.test 1.17 05/10/20 21:30:09 jmiller@stripped +3 -3 updated for engine_type mysql-test/extra/rpl_tests/rpl000006.test 1.16 05/10/20 21:28:13 jmiller@stripped +0 -0 Rename: mysql-test/t/rpl000006.test -> mysql-test/extra/rpl_tests/rpl000006.test mysql-test/t/rpl_row_relayrotate.test 1.4 05/10/20 21:22:07 jmiller@stripped +2 -9 New wrapper mysql-test/t/rpl_row_relayrotate.test 1.3 05/10/20 21:20:36 jmiller@stripped +0 -0 bk cp ./t/rpl_row_trig004.test ./t/rpl_row_relayrotate.test mysql-test/extra/rpl_tests/rpl_row_relayrotate.test 1.5 05/10/20 21:20:03 jmiller@stripped +0 -0 Rename: mysql-test/t/rpl_row_relayrotate.test -> mysql-test/extra/rpl_tests/rpl_row_relayrotate.test mysql-test/t/rpl_row_relayrotate.test 1.4 05/10/20 21:19:53 jmiller@stripped +1 -2 Updated to use engine_type var mysql-test/extra/rpl_tests/rpl_auto_increment.test 1.5 05/10/20 21:17:49 jmiller@stripped +1 -1 Updated to use engine_type var mysql-test/t/rpl_auto_increment.test 1.3 05/10/20 21:12:33 jmiller@stripped +0 -0 bk cp ./t/rpl_insert_ignore.test ./t/rpl_auto_increment.test mysql-test/extra/rpl_tests/rpl_auto_increment.test 1.4 05/10/20 21:11:47 jmiller@stripped +0 -0 Rename: mysql-test/t/rpl_auto_increment.test -> mysql-test/extra/rpl_tests/rpl_auto_increment.test mysql-test/t/rpl_auto_increment.test 1.3 05/10/20 21:11:31 jmiller@stripped +7 -8 Updated to use engine_type var mysql-test/extra/rpl_tests/rpl_failed_optimize.test 1.5 05/10/20 21:05:58 jmiller@stripped +1 -1 updated files mysql-test/t/rpl_failed_optimize.test 1.6 05/10/20 21:03:40 jmiller@stripped +4 -4 updated files mysql-test/t/rpl_failed_optimize.test 1.5 05/10/20 21:02:27 jmiller@stripped +0 -0 bk cp ./t/rpl_row_sp006_InnoDB.test ./t/rpl_failed_optimize.test mysql-test/extra/rpl_tests/rpl_failed_optimize.test 1.4 05/10/20 21:01:39 jmiller@stripped +0 -0 Rename: mysql-test/t/rpl_failed_optimize.test -> mysql-test/extra/rpl_tests/rpl_failed_optimize.test mysql-test/t/rpl_failed_optimize.test 1.3 05/10/20 21:01:22 jmiller@stripped +2 -3 updated files mysql-test/t/rpl_failed_optimize.test 1.4 05/10/20 20:57:14 jmiller@stripped +1 -1 updated files mysql-test/t/rpl_auto_increment.test 1.2 05/10/20 20:57:12 jmiller@stripped +2 -2 updated files mysql-test/t/rpl_auto_increment.test 1.1 05/10/20 01:24:41 jmiller@stripped +7 -0 New wrappers mysql-test/t/rpl_auto_increment.test 1.0 05/10/20 01:24:41 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/rpl_insert_ignore.test mysql-test/t/rpl_failed_optimize.test 1.3 05/10/19 20:01:21 jmiller@stripped +2 -2 updated for sp006 mysql-test/t/rpl_failed_optimize.test 1.2 05/10/19 20:00:21 jmiller@stripped +0 -0 bk cp ./t/rpl_row_sp002_innodb.test ./t/rpl_row_sp006_InnoDB.test mysql-test/t/rpl_failed_optimize.test 1.1 05/10/19 19:45:16 jmiller@stripped +6 -0 wrapped test for engine type mysql-test/t/rpl_failed_optimize.test 1.0 05/10/19 19:45:16 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/rpl_row_sp002_innodb.test mysql-test/t/rpl_row_relayrotate.test 1.2 05/10/18 22:04:56 jmiller@stripped +1 -0 Added innodb include mysql-test/t/rpl_row_relayrotate.test 1.1 05/10/18 21:58:21 jmiller@stripped +13 -0 New rbr trigger test case mysql-test/t/rpl_row_relayrotate.test 1.0 05/10/18 21:58:21 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/mysql-5.0-wl1012/mysql-test/t/rpl_row_trig004.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/mysql-5.0-wl1012 --- 1.5/mysql-test/t/rpl_multi_update2.test 2005-09-15 16:17:20 +02:00 +++ 1.7/mysql-test/extra/rpl_tests/rpl_multi_update2.test 2005-10-20 21:53:50 +02:00 @@ -4,15 +4,15 @@ source include/master-slave.inc; -CREATE TABLE t1 ( +eval CREATE TABLE t1 ( a int unsigned not null auto_increment primary key, b int unsigned -) ENGINE=MyISAM; +) ENGINE=$engine_type; -CREATE TABLE t2 ( +eval CREATE TABLE t2 ( a int unsigned not null auto_increment primary key, b int unsigned -) ENGINE=MyISAM; +) ENGINE=$engine_type; INSERT INTO t1 VALUES (NULL, 0); INSERT INTO t1 SELECT NULL, 0 FROM t1; --- 1.7/mysql-test/t/rpl_multi_update3.test 2005-10-10 20:23:42 +02:00 +++ 1.9/mysql-test/extra/rpl_tests/rpl_multi_update3.test 2005-10-20 21:57:47 +02:00 @@ -12,15 +12,15 @@ SELECT '-------- Test for BUG#9361 --------' as ""; --enable_query_log -CREATE TABLE t1 ( +eval CREATE TABLE t1 ( a int unsigned not null auto_increment primary key, b int unsigned -) ENGINE=MyISAM; +) ENGINE=$engine_type; -CREATE TABLE t2 ( +eval CREATE TABLE t2 ( a int unsigned not null auto_increment primary key, b int unsigned -) ENGINE=MyISAM; +) ENGINE=$engine_type; INSERT INTO t1 VALUES (NULL, 0); INSERT INTO t1 SELECT NULL, 0 FROM t1; --- 1.9/mysql-test/t/rpl_stm_EE_err.test 2005-09-16 13:12:01 +02:00 +++ 1.11/mysql-test/extra/rpl_tests/rpl_stm_EE_err.test 2005-10-20 22:38:27 +02:00 @@ -12,7 +12,7 @@ -- source include/master-slave.inc -create table t1 (a int) engine=myisam; +eval create table t1 (a int) engine=$engine_type; flush tables; system rm ./var/master-data/test/t1.MYI ; drop table if exists t1; @@ -23,7 +23,7 @@ # Now a real error. connection master; -create table t1 (a int, unique(a)) engine=myisam; +eval create table t1 (a int, unique(a)) engine=$engine_type; set sql_log_bin=0; insert into t1 values(2); set sql_log_bin=1; --- 1.18/mysql-test/t/rpl_stm_charset.test 2005-08-13 09:44:26 +02:00 +++ 1.20/mysql-test/extra/rpl_tests/rpl_stm_charset.test 2005-10-20 22:35:31 +02:00 @@ -164,10 +164,10 @@ # BUG#6676: Derivation of variables must be correct on slave # connection master; -create table `t1` ( +eval create table `t1` ( `pk` varchar(10) not null default '', primary key (`pk`) -) engine=myisam default charset=latin1; +) engine=$engine_type default charset=latin1; set @p=_latin1 'test'; update t1 set pk='test' where pk=@p; drop table t1; --- 1.1/mysql-test/t/rpl_delete_no_where.test 2005-09-29 09:49:12 +02:00 +++ 1.3/mysql-test/extra/rpl_tests/rpl_delete_no_where.test 2005-10-20 21:38:35 +02:00 @@ -2,9 +2,9 @@ # (not internally row-per-row but more like a TRUNCATE, MyISAM # supports that), is replicated (BUG#13576). -source include/master-slave.inc; +-- source include/master-slave.inc -create table t1 (a int, b int) engine=myisam; +eval create table t1 (a int, b int) engine=$engine_type; insert into t1 values(1,1); sync_slave_with_master; select * from t1; --- 1.11/mysql-test/t/rpl_multi_update.test 2005-09-29 09:49:11 +02:00 +++ 1.13/mysql-test/extra/rpl_tests/rpl_multi_update.test 2005-10-20 22:00:56 +02:00 @@ -1,14 +1,14 @@ source include/master-slave.inc; -CREATE TABLE t1 ( +eval CREATE TABLE t1 ( a int unsigned not null auto_increment primary key, b int unsigned -) ENGINE=MyISAM; +) ENGINE=$engine_type; -CREATE TABLE t2 ( +eval CREATE TABLE t2 ( a int unsigned not null auto_increment primary key, b int unsigned -) ENGINE=MyISAM; +) ENGINE=$engine_type; INSERT INTO t1 VALUES (NULL, 0); INSERT INTO t1 SELECT NULL, 0 FROM t1; --- 1.7/mysql-test/t/rpl_row_delayed_ins.test 2005-10-17 18:18:04 +02:00 +++ 1.9/mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test 2005-10-20 22:17:32 +02:00 @@ -6,7 +6,7 @@ connection master; let $VERSION=`select version()`; -create table t1(a int not null primary key) engine=myisam; +eval create table t1(a int not null primary key) engine=$engine_type; insert delayed into t1 values (1),(2),(3); # force DELAYED thread to execute. We don't write FLUSH TABLES # to binlog because it crashes slave (filed as BUG#13360). --- 1.3/mysql-test/t/rpl_row_EE_err.test 2005-09-11 00:37:55 +02:00 +++ 1.5/mysql-test/extra/rpl_tests/rpl_row_EE_err.test 2005-10-20 22:20:58 +02:00 @@ -15,7 +15,7 @@ -- source include/master-slave.inc -create table t1 (a int) engine=myisam; +eval create table t1 (a int) engine=$engine_type; flush tables; system rm ./var/master-data/test/t1.MYI ; drop table if exists t1; @@ -26,7 +26,7 @@ # Now a real error. connection master; -create table t1 (a int, unique(a)) engine=myisam; +eval create table t1 (a int, unique(a)) engine=$engine_type; set sql_log_bin=0; insert into t1 values(2); set sql_log_bin=1; --- 1.7/mysql-test/t/rpl_row_UUID.test 2005-10-04 18:28:37 +02:00 +++ 1.9/mysql-test/extra/rpl_tests/rpl_row_UUID.test 2005-10-20 22:28:00 +02:00 @@ -19,7 +19,7 @@ # Section 1 test -CREATE TABLE test.t1 (a INT, blob_column LONGBLOB, vchar_column VARCHAR(100), PRIMARY KEY(a)) engine=myisam; +eval CREATE TABLE test.t1 (a INT, blob_column LONGBLOB, vchar_column VARCHAR(100), PRIMARY KEY(a)) engine=$engine_type; INSERT INTO test.t1 VALUES(1,UUID(),UUID()); delimiter |; create procedure test.p1() --- New file --- +++ mysql-test/t/rpl000006.test 05/10/20 21:31:23 let $engine_type=MyISAM; -- source extra/rpl_tests/rpl000006.test --- New file --- +++ mysql-test/t/rpl_auto_increment.test 05/10/20 01:24:41 ##################################### # Wrapper for rpl_insert_ignore.test# ##################################### -- source include/have_innodb.inc let $engine_type=innodb; let $engine_type2=myisam; -- source extra/rpl_tests/rpl_insert_ignore.test --- New file --- +++ mysql-test/t/rpl_delete_no_where.test 05/10/20 21:37:55 let $engine_type=myisam; -- source extra/rpl_tests/rpl_delete_no_where.test --- New file --- +++ mysql-test/t/rpl_failed_optimize.test 05/10/19 19:45:16 ####################################### # Wrapper for rpl_failed_optimize.test# ####################################### -- source include/have_innodb.inc let $engine_type=InnoDB; -- source extra/rpl_tests/rpl_failed_optimize.test --- New file --- +++ mysql-test/t/rpl_loaddata.test 05/10/20 21:45:03 let $engine_type=MyISAM; -- source extra/rpl_tests/rpl_loaddata.test --- New file --- +++ mysql-test/t/rpl_multi_update.test 05/10/20 22:00:38 let $engine_type=MyISAM; -- source extra/rpl_tests/rpl_multi_update.test --- New file --- +++ mysql-test/t/rpl_multi_update2.test 05/10/20 21:53:22 let $engine_type=MyISAM; --source extra/rpl_tests/rpl_multi_update2.test --- New file --- +++ mysql-test/t/rpl_multi_update3.test 05/10/20 21:57:39 let $engine_type=MyISAM; -- source extra/rpl_tests/rpl_multi_update3.test --- New file --- +++ mysql-test/t/rpl_row_001.test 05/10/20 22:05:16 let $engine_type=MYISAM; -- source extra/rpl_tests/rpl_row_001.test --- New file --- +++ mysql-test/t/rpl_row_EE_err.test 05/10/20 22:20:47 let $engine_type=myisam; -- source extra/rpl_tests/rpl_row_EE_err.test --- New file --- +++ mysql-test/t/rpl_row_UUID.test 05/10/20 22:27:45 let $engine_type=myisam; --source extra/rpl_tests/rpl_row_UUID.test --- New file --- +++ mysql-test/t/rpl_row_charset.test 05/10/20 22:08:54 let $engine_type=myisam; -- source extra/rpl_tests/rpl_row_charset.test --- New file --- +++ mysql-test/t/rpl_row_delayed_ins.test 05/10/20 22:17:20 let $engine_type=myisam; -- source extra/rpl_tests/rpl_row_delayed_ins.test --- New file --- +++ mysql-test/t/rpl_row_multi_update3.test 05/10/20 22:24:37 let $engine_type=MyISAM; -- source extra/rpl_tests/rpl_row_multi_update3.test --- New file --- +++ mysql-test/t/rpl_row_relayrotate.test 05/10/18 21:58:21 ############################################################################# # Includes -- source include/have_binlog_format_row.inc -- source include/have_innodb.inc let $engine_type=innodb; -- source extra/rpl_tests/rpl_row_relayrotate.test --- New file --- +++ mysql-test/t/rpl_stm_000001.test 05/10/20 22:31:45 let $engine_type=myisam; -- source extra/rpl_tests/rpl_stm_000001.test --- New file --- +++ mysql-test/t/rpl_stm_EE_err.test 05/10/20 22:38:17 let $engine_type=myisam; -- source extra/rpl_tests/rpl_stm_EE_err.test --- New file --- +++ mysql-test/t/rpl_stm_charset.test 05/10/20 22:35:21 let $engine_type=myisam; -- source extra/rpl_tests/rpl_stm_charset.test --- 1.2/mysql-test/t/rpl_failed_optimize.test 2005-07-28 02:21:47 +02:00 +++ 1.5/mysql-test/extra/rpl_tests/rpl_failed_optimize.test 2005-10-20 21:05:58 +02:00 @@ -1,5 +1,4 @@ -source include/have_innodb.inc; -source include/master-slave.inc; +-- source include/master-slave.inc # # BUG#5551 "Failed OPTIMIZE TABLE is logged to binary log" @@ -7,7 +6,7 @@ # when OPTIMIZE TABLE is executed on a non-existing table # -CREATE TABLE t1 ( a int ) ENGINE=InnoDB; +eval CREATE TABLE t1 ( a int ) ENGINE=$engine_type; BEGIN; INSERT INTO t1 VALUES (1); --- 1.4/mysql-test/t/rpl_row_001.test 2005-08-03 22:49:45 +02:00 +++ 1.6/mysql-test/extra/rpl_tests/rpl_row_001.test 2005-10-20 22:05:29 +02:00 @@ -43,7 +43,7 @@ connection master; # we'll use table-level locking to delay slave SQL thread -CREATE TABLE t1 (n INT) ENGINE=MYISAM; +eval CREATE TABLE t1 (n INT) ENGINE=$engine_type; sync_slave_with_master; connection master; RESET MASTER; --- 1.20/mysql-test/t/rpl_loaddata.test 2005-09-16 13:12:01 +02:00 +++ 1.22/mysql-test/extra/rpl_tests/rpl_loaddata.test 2005-10-20 21:45:21 +02:00 @@ -125,8 +125,8 @@ connection master; reset master; -create table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60), -unique(day)) engine=MyISAM; # no transactions +eval create table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60), +unique(day)) engine=$engine_type; # no transactions --error 1062 load data infile '../../std_data/rpl_loaddata2.dat' into table t2 fields terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by --- 1.2/mysql-test/t/rpl_auto_increment.test 2004-11-21 15:42:49 +01:00 +++ 1.5/mysql-test/extra/rpl_tests/rpl_auto_increment.test 2005-10-20 21:17:49 +02:00 @@ -1,10 +1,9 @@ # # Test of auto_increment with offset # -source include/have_innodb.inc; -source include/master-slave.inc; +-- source include/master-slave.inc -create table t1 (a int not null auto_increment,b int, primary key (a)) engine=myisam auto_increment=3; +eval create table t1 (a int not null auto_increment,b int, primary key (a)) engine=$engine_type2 auto_increment=3; insert into t1 values (NULL,1),(NULL,2),(NULL,3); select * from t1; @@ -13,7 +12,7 @@ connection master; drop table t1; -create table t1 (a int not null auto_increment,b int, primary key (a)) engine=myisam; +eval create table t1 (a int not null auto_increment,b int, primary key (a)) engine=$engine_type2; insert into t1 values (1,1),(NULL,2),(3,3),(NULL,4); delete from t1 where b=4; insert into t1 values (NULL,5),(NULL,6); @@ -28,7 +27,7 @@ set @@session.auto_increment_increment=100, @@session.auto_increment_offset=10; show variables like "%auto_inc%"; -create table t1 (a int not null auto_increment, primary key (a)) engine=myisam; +eval create table t1 (a int not null auto_increment, primary key (a)) engine=$engine_type2; # Insert with 2 insert statements to get better testing of logging insert into t1 values (NULL),(5),(NULL); insert into t1 values (250),(NULL); @@ -46,7 +45,7 @@ # # Same test with innodb (as the innodb code is a bit different) # -create table t1 (a int not null auto_increment, primary key (a)) engine=innodb; +eval create table t1 (a int not null auto_increment, primary key (a)) engine=$engine_type; # Insert with 2 insert statements to get better testing of logging insert into t1 values (NULL),(5),(NULL); insert into t1 values (250),(NULL); @@ -62,7 +61,7 @@ drop table t1; set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1; -create table t1 (a int not null auto_increment, primary key (a)) engine=myisam; +eval create table t1 (a int not null auto_increment, primary key (a)) engine=$engine_type2; # Insert with 2 insert statements to get better testing of logging insert into t1 values (NULL),(5),(NULL),(NULL); insert into t1 values (500),(NULL),(502),(NULL),(NULL); @@ -84,7 +83,7 @@ # set @@session.auto_increment_increment=10, @@session.auto_increment_offset=1; -create table t1 (a int not null auto_increment, primary key (a)) engine=myisam; +eval create table t1 (a int not null auto_increment, primary key (a)) engine=$engine_type2; sync_slave_with_master; insert into t1 values(2),(12),(22),(32),(42); --- 1.2/mysql-test/t/rpl_row_multi_update3.test 2005-08-26 02:18:44 +02:00 +++ 1.4/mysql-test/extra/rpl_tests/rpl_row_multi_update3.test 2005-10-20 22:24:53 +02:00 @@ -9,15 +9,15 @@ SELECT '-------- Test for BUG#9361 --------' as ""; --enable_query_log -CREATE TABLE t1 ( +eval CREATE TABLE t1 ( a int unsigned not null auto_increment primary key, b int unsigned -) ENGINE=MyISAM; +) ENGINE=$engine_type; -CREATE TABLE t2 ( +eval CREATE TABLE t2 ( a int unsigned not null auto_increment primary key, b int unsigned -) ENGINE=MyISAM; +) ENGINE=$engine_type; INSERT INTO t1 VALUES (NULL, 0); INSERT INTO t1 SELECT NULL, 0 FROM t1; --- 1.3/mysql-test/t/rpl_row_relayrotate.test 2005-10-17 20:04:03 +02:00 +++ 1.5/mysql-test/extra/rpl_tests/rpl_row_relayrotate.test 2005-10-20 21:20:03 +02:00 @@ -11,14 +11,13 @@ # The slave is started with max_binlog_size=16384 bytes, # to force many rotations (approximately 30 rotations) --- source include/have_innodb.inc -- source include/master-slave.inc connection slave; stop slave; connection master; --disable_warnings -create table t1 (a int) engine=innodb; +eval create table t1 (a int) engine=$engine_type; --enable_warnings let $1=8000; disable_query_log; --- 1.4/mysql-test/t/rpl_row_charset.test 2005-10-14 21:38:40 +02:00 +++ 1.6/mysql-test/extra/rpl_tests/rpl_row_charset.test 2005-10-20 22:09:07 +02:00 @@ -172,10 +172,10 @@ # select "--- --6676--" as ""; connection master; -create table `t1` ( +eval create table `t1` ( `pk` varchar(10) not null default '', primary key (`pk`) -) engine=myisam default charset=latin1; +) engine=$engine_type default charset=latin1; set @p=_latin1 'test'; update t1 set pk='test' where pk=@p; drop table t1; --- 1.42/mysql-test/t/rpl_stm_000001.test 2005-09-10 13:42:29 +02:00 +++ 1.44/mysql-test/extra/rpl_tests/rpl_stm_000001.test 2005-10-20 22:31:55 +02:00 @@ -45,7 +45,7 @@ connection master; # we'll use table-level locking to delay slave SQL thread -create table t1 (n int) engine=myisam; +eval create table t1 (n int) engine=$engine_type; sync_slave_with_master; connection master; reset master; --- 1.15/mysql-test/t/rpl000006.test 2005-07-28 02:21:47 +02:00 +++ 1.17/mysql-test/extra/rpl_tests/rpl000006.test 2005-10-20 21:30:09 +02:00 @@ -1,7 +1,7 @@ # # Test forced timestamp # -source include/master-slave.inc; +-- source include/master-slave.inc # Don't log table creating to the slave as we want to test LOAD TABLE set SQL_LOG_BIN=0,timestamp=200006; @@ -28,9 +28,9 @@ # Don't log table creating to the slave as we want to test LOAD TABLE set SQL_LOG_BIN=0; -CREATE TABLE t1 ( +eval CREATE TABLE t1 ( a int not null -) ENGINE=MyISAM MAX_ROWS=4000 CHECKSUM=1; +) ENGINE=$engine_type MAX_ROWS=4000 CHECKSUM=1; INSERT INTO t1 VALUES (1); save_master_pos; connection slave;
| Thread | ||
|---|---|---|
| • bk commit into 5.0 tree (jmiller:1.2022) | Jonathan Miller | 22 Oct |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.661 sec. using MySQL 5.1.14-beta-log