From 453eea9b9ce99dba127d3050d256ba9576b40800 Mon Sep 17 00:00:00 2001 From: unknown <jmiller@mysql.com> Date: Fri, 3 Feb 2006 15:38:27 +0100 Subject: [PATCH] Implemented requested changes by Lars and did some general test cleanup. Lots more togo mysql-test/t/rpl_relay_space_myisam.test: Added Comment mysql-test/t/rpl_ndb_relay_space.test: Added more comments BitKeeper/deleted/.del-rpl_relay_space_ndb.result~4d6013c0afef9b5e: Delete: mysql-test/r/rpl_relay_space_ndb.result mysql-test/t/rpl_relay_space_innodb.test: Added Comment BitKeeper/deleted/.del-rpl000006.test~6da9f1808deb79c7: Delete: mysql-test/t/rpl000006.test BitKeeper/deleted/.del-rpl000004.test~61532b03f9ad2734: Delete: mysql-test/t/rpl000004.test BitKeeper/deleted/.del-rpl000004.result~a3147834a662043a: Delete: mysql-test/r/rpl000004.result mysql-test/t/rpl_mixed_ddl_dml.test: Rename: mysql-test/t/rpl000002.test -> mysql-test/t/rpl_mixed_ddl_dml.test mysql-test/r/rpl_mixed_ddl_dml.result: Rename: mysql-test/r/rpl000002.result -> mysql-test/r/rpl_mixed_ddl_dml.result mysql-test/t/rpl_ignore_table_update.test: Rename: mysql-test/t/rpl000008.test -> mysql-test/t/rpl_ignore_table_update.test mysql-test/t/rpl_ignore_table_update-slave.opt: Rename: mysql-test/t/rpl000008-slave.opt -> mysql-test/t/rpl_ignore_table_update-slave.opt mysql-test/r/rpl_ignore_table_update.result: Rename: mysql-test/r/rpl000008.result -> mysql-test/r/rpl_ignore_table_update.result mysql-test/t/rpl_load_table_from_master.test: Fixing test since test where combined mysql-test/r/rpl_load_table_from_master.result: Updated results file BitKeeper/deleted/.del-rpl000004.a.result~3415f066cb91c460: Delete: mysql-test/r/rpl000004.a.result BitKeeper/deleted/.del-rpl000004.b.result~352b35351551485: Delete: mysql-test/r/rpl000004.b.result mysql-test/t/disabled.def: added rpl_ndb_relay_space Results are not deterministic mysql-test/t/rpl_load_from_master.test: Rename: mysql-test/t/rpl000009.test -> mysql-test/t/rpl_load_from_master.test mysql-test/t/rpl_load_from_master-slave.opt: Rename: mysql-test/t/rpl000009-slave.opt -> mysql-test/t/rpl_load_from_master-slave.opt mysql-test/r/rpl_load_from_master.result: Rename: mysql-test/r/rpl000009.result -> mysql-test/r/rpl_load_from_master.result mysql-test/t/rpl_temp_table.test: Rename: mysql-test/t/rpl_000012.test -> mysql-test/t/rpl_temp_table.test mysql-test/r/rpl_temp_table.result: Rename: mysql-test/r/rpl_000012.result -> mysql-test/r/rpl_temp_table.result --- mysql-test/extra/rpl_tests/rpl000006.test | 55 ----------- mysql-test/r/rpl000004.a.result | 2 - mysql-test/r/rpl000004.b.result | 2 - mysql-test/r/rpl000006.result | 29 ------ ....result => rpl_ignore_table_update.result} | 0 ...009.result => rpl_load_from_master.result} | 16 ++-- ...sult => rpl_load_table_from_master.result} | 21 +++++ ...000002.result => rpl_mixed_ddl_dml.result} | 0 mysql-test/r/rpl_relay_space_ndb.result | 25 ----- ...pl_000012.result => rpl_temp_table.result} | 0 mysql-test/t/disabled.def | 3 +- mysql-test/t/rpl000004.test | 33 ------- mysql-test/t/rpl000006.test | 2 - ....opt => rpl_ignore_table_update-slave.opt} | 0 ...0008.test => rpl_ignore_table_update.test} | 0 ...ave.opt => rpl_load_from_master-slave.opt} | 0 ...l000009.test => rpl_load_from_master.test} | 21 ++--- mysql-test/t/rpl_load_table_from_master.test | 93 +++++++++++++++++++ ...{rpl000002.test => rpl_mixed_ddl_dml.test} | 0 mysql-test/t/rpl_ndb_relay_space.test | 20 +++- mysql-test/t/rpl_relay_space_innodb.test | 20 +++- mysql-test/t/rpl_relay_space_myisam.test | 20 +++- .../{rpl_000012.test => rpl_temp_table.test} | 4 +- 23 files changed, 186 insertions(+), 180 deletions(-) delete mode 100644 mysql-test/extra/rpl_tests/rpl000006.test delete mode 100644 mysql-test/r/rpl000004.a.result delete mode 100644 mysql-test/r/rpl000004.b.result delete mode 100644 mysql-test/r/rpl000006.result rename mysql-test/r/{rpl000008.result => rpl_ignore_table_update.result} (100%) rename mysql-test/r/{rpl000009.result => rpl_load_from_master.result} (87%) rename mysql-test/r/{rpl000004.result => rpl_load_table_from_master.result} (57%) rename mysql-test/r/{rpl000002.result => rpl_mixed_ddl_dml.result} (100%) delete mode 100644 mysql-test/r/rpl_relay_space_ndb.result rename mysql-test/r/{rpl_000012.result => rpl_temp_table.result} (100%) delete mode 100644 mysql-test/t/rpl000004.test delete mode 100644 mysql-test/t/rpl000006.test rename mysql-test/t/{rpl000008-slave.opt => rpl_ignore_table_update-slave.opt} (100%) rename mysql-test/t/{rpl000008.test => rpl_ignore_table_update.test} (100%) rename mysql-test/t/{rpl000009-slave.opt => rpl_load_from_master-slave.opt} (100%) rename mysql-test/t/{rpl000009.test => rpl_load_from_master.test} (89%) create mode 100644 mysql-test/t/rpl_load_table_from_master.test rename mysql-test/t/{rpl000002.test => rpl_mixed_ddl_dml.test} (100%) rename mysql-test/t/{rpl_000012.test => rpl_temp_table.test} (93%) diff --git a/mysql-test/extra/rpl_tests/rpl000006.test b/mysql-test/extra/rpl_tests/rpl000006.test deleted file mode 100644 index e4fbe841346..00000000000 --- a/mysql-test/extra/rpl_tests/rpl000006.test +++ /dev/null @@ -1,55 +0,0 @@ -########################################################### -# Change Author: JBM -# Change Date: 2006-2-2 -# Change: Added ENGINE=$engine_type for first create table -# Reason: Only MyISAM supports load from master no need to -# run test case for other engines, in addition test will -# fail if other engines are set as default engine -########################################################### -# -# Test forced timestamp -# --- 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; -eval create table t1(t timestamp not null,a char(1))ENGINE=$engine_type; -insert into t1 ( a) values ('F'); -select unix_timestamp(t) from t1; -connection slave; -load table t1 from master; -select unix_timestamp(t) from t1; - -# Delete the created table on master and slave -connection master; -set SQL_LOG_BIN=1,timestamp=default; -drop table t1; -save_master_pos; -connection slave; -sync_with_master; -connection master; - -# -# Test copying table with checksum -# - -# Don't log table creating to the slave as we want to test LOAD TABLE -set SQL_LOG_BIN=0; - -eval CREATE TABLE t1 ( - a int not null -) ENGINE=$engine_type MAX_ROWS=4000 CHECKSUM=1; -INSERT INTO t1 VALUES (1); -save_master_pos; -connection slave; -sync_with_master; -load table t1 from master; -check table t1; -drop table t1; -connection master; -drop table t1; -save_master_pos; -connection slave; -sync_with_master; - -# End of 4.1 tests diff --git a/mysql-test/r/rpl000004.a.result b/mysql-test/r/rpl000004.a.result deleted file mode 100644 index 694d7429a14..00000000000 --- a/mysql-test/r/rpl000004.a.result +++ /dev/null @@ -1,2 +0,0 @@ -Table Op Msg_type Msg_text -test.t1 check status OK diff --git a/mysql-test/r/rpl000004.b.result b/mysql-test/r/rpl000004.b.result deleted file mode 100644 index 7e05933909e..00000000000 --- a/mysql-test/r/rpl000004.b.result +++ /dev/null @@ -1,2 +0,0 @@ -count(*) -10 diff --git a/mysql-test/r/rpl000006.result b/mysql-test/r/rpl000006.result deleted file mode 100644 index bb8d57a30cf..00000000000 --- a/mysql-test/r/rpl000006.result +++ /dev/null @@ -1,29 +0,0 @@ -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 SQL_LOG_BIN=0,timestamp=200006; -create table t1(t timestamp not null,a char(1))ENGINE=MyISAM; -insert into t1 ( a) values ('F'); -select unix_timestamp(t) from t1; -unix_timestamp(t) -200006 -load table t1 from master; -select unix_timestamp(t) from t1; -unix_timestamp(t) -200006 -set SQL_LOG_BIN=1,timestamp=default; -drop table t1; -set SQL_LOG_BIN=0; -CREATE TABLE t1 ( -a int not null -) ENGINE=MyISAM MAX_ROWS=4000 CHECKSUM=1; -INSERT INTO t1 VALUES (1); -load table t1 from master; -check table t1; -Table Op Msg_type Msg_text -test.t1 check status OK -drop table t1; -drop table t1; diff --git a/mysql-test/r/rpl000008.result b/mysql-test/r/rpl_ignore_table_update.result similarity index 100% rename from mysql-test/r/rpl000008.result rename to mysql-test/r/rpl_ignore_table_update.result diff --git a/mysql-test/r/rpl000009.result b/mysql-test/r/rpl_load_from_master.result similarity index 87% rename from mysql-test/r/rpl000009.result rename to mysql-test/r/rpl_load_from_master.result index 27569a087da..edf1f0ee7c9 100644 --- a/mysql-test/r/rpl000009.result +++ b/mysql-test/r/rpl_load_from_master.result @@ -13,11 +13,11 @@ drop database if exists mysqltest3; create database mysqltest2; create database mysqltest; create database mysqltest2; -create table mysqltest2.foo (n int); +create table mysqltest2.foo (n int)ENGINE=MyISAM; insert into mysqltest2.foo values(4); -create table mysqltest2.foo (n int); +create table mysqltest2.foo (n int)ENGINE=MyISAM; insert into mysqltest2.foo values(5); -create table mysqltest.bar (m int); +create table mysqltest.bar (m int)ENGINE=MyISAM; insert into mysqltest.bar values(15); select mysqltest2.foo.n,mysqltest.bar.m from mysqltest2.foo,mysqltest.bar; n m @@ -55,17 +55,17 @@ cluster_replication mysql test create database mysqltest2; -create table mysqltest2.t1(n int, s char(20)); +create table mysqltest2.t1(n int, s char(20))ENGINE=MyISAM; insert into mysqltest2.t1 values (1, 'original foo.t1'); -create table mysqltest2.t3(n int, s char(20)); +create table mysqltest2.t3(n int, s char(20))ENGINE=MyISAM; insert into mysqltest2.t3 values (1, 'original foo.t3'); create database mysqltest3; -create table mysqltest3.t1(n int, s char(20)); +create table mysqltest3.t1(n int, s char(20))ENGINE=MyISAM; insert into mysqltest3.t1 values (1, 'original foo2.t1'); create database mysqltest; -create table mysqltest.t1(n int, s char(20)); +create table mysqltest.t1(n int, s char(20))ENGINE=MyISAM; insert into mysqltest.t1 values (1, 'original bar.t1'); -create table mysqltest.t3(n int, s char(20)); +create table mysqltest.t3(n int, s char(20))ENGINE=MyISAM; insert into mysqltest.t3 values (1, 'original bar.t3'); load data from master; show databases; diff --git a/mysql-test/r/rpl000004.result b/mysql-test/r/rpl_load_table_from_master.result similarity index 57% rename from mysql-test/r/rpl000004.result rename to mysql-test/r/rpl_load_table_from_master.result index 42e43546ffb..308e54557fb 100644 --- a/mysql-test/r/rpl000004.result +++ b/mysql-test/r/rpl_load_table_from_master.result @@ -4,6 +4,27 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; +SET SQL_LOG_BIN=0,timestamp=200006; +CREATE TABLE t1(t TIMESTAMP NOT NULL,a CHAR(1))ENGINE=MyISAM; +INSERT INTO t1 ( a) VALUE ('F'); +select unix_timestamp(t) from t1; +unix_timestamp(t) +200006 +load table t1 from master; +select unix_timestamp(t) from t1; +unix_timestamp(t) +200006 +set SQL_LOG_BIN=1,timestamp=default; +drop table t1; +set SQL_LOG_BIN=0; +CREATE TABLE t1 (a INT NOT NULL) ENGINE=MyISAM MAX_ROWS=4000 CHECKSUM=1; +INSERT INTO t1 VALUES (1); +load table t1 from master; +check table t1; +Table Op Msg_type Msg_text +test.t1 check status OK +drop table t1; +drop table t1; set SQL_LOG_BIN=0; create table t1 (word char(20) not null, index(word))ENGINE=MyISAM; load data infile '../../std_data/words.dat' into table t1; diff --git a/mysql-test/r/rpl000002.result b/mysql-test/r/rpl_mixed_ddl_dml.result similarity index 100% rename from mysql-test/r/rpl000002.result rename to mysql-test/r/rpl_mixed_ddl_dml.result diff --git a/mysql-test/r/rpl_relay_space_ndb.result b/mysql-test/r/rpl_relay_space_ndb.result deleted file mode 100644 index 02bff7ae881..00000000000 --- a/mysql-test/r/rpl_relay_space_ndb.result +++ /dev/null @@ -1,25 +0,0 @@ -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; -SHOW VARIABLES LIKE 'relay_log_space_limit'; -Variable_name Value -relay_log_space_limit 0 -CREATE TABLE t1 (name varchar(64), age smallint(3))ENGINE=MyISAM; -INSERT INTO t1 SET name='Andy', age=31; -INSERT t1 SET name='Jacob', age=2; -INSERT into t1 SET name='Caleb', age=1; -ALTER TABLE t1 ADD id int(8) ZEROFILL AUTO_INCREMENT PRIMARY KEY; -SELECT * FROM t1 ORDER BY id; -name age id -Andy 31 00000001 -Jacob 2 00000002 -Caleb 1 00000003 -SELECT * FROM t1 ORDER BY id; -name age id -Andy 31 00000001 -Jacob 2 00000002 -Caleb 1 00000003 -drop table t1; diff --git a/mysql-test/r/rpl_000012.result b/mysql-test/r/rpl_temp_table.result similarity index 100% rename from mysql-test/r/rpl_000012.result rename to mysql-test/r/rpl_temp_table.result diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 11658892c54..843c5a1a2e4 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -32,6 +32,7 @@ system_mysql_db : Needs fixing system_mysql_db_fix : Needs fixing #ndb_alter_table_row : sometimes wrong error 1015!=1046 ndb_gis : garbled msgs from corrupt THD* -rpl_ndb_auto_inc.test : MySQL Bugs:17086 +rpl_ndb_auto_inc : MySQL Bugs:17086 +rpl_ndb_relay_space : Results are not deterministic # vim: set filetype=conf: diff --git a/mysql-test/t/rpl000004.test b/mysql-test/t/rpl000004.test deleted file mode 100644 index 993b804d469..00000000000 --- a/mysql-test/t/rpl000004.test +++ /dev/null @@ -1,33 +0,0 @@ -###################################### -# Change Author: JBM -# Change Date: 2006-02-02 -# Change: Added ENGINE=MyISAM -# Reason: LOAD FROM MASTER is only supported from -# MyISAM, therefore there is no reason for this test -# To use anyother Engine -###################################### -source include/master-slave.inc; - -set SQL_LOG_BIN=0; -create table t1 (word char(20) not null, index(word))ENGINE=MyISAM; -load data infile '../../std_data/words.dat' into table t1; -create table t2 (word char(20) not null)ENGINE=MyISAM; -load data infile '../../std_data/words.dat' into table t2; -create table t3 (word char(20) not null primary key)ENGINE=MyISAM; -connection slave; -load table t1 from master; -load table t2 from master; -load table t3 from master; -check table t1; -select count(*) from t2; -select count(*) from t3; -connection master; -set SQL_LOG_BIN=1; -drop table if exists t1,t2,t3; -save_master_pos; -connection slave; -sync_with_master; -create table t1(n int); -drop table t1; - -# End of 4.1 tests diff --git a/mysql-test/t/rpl000006.test b/mysql-test/t/rpl000006.test deleted file mode 100644 index bca97391f8e..00000000000 --- a/mysql-test/t/rpl000006.test +++ /dev/null @@ -1,2 +0,0 @@ -let $engine_type=MyISAM; --- source extra/rpl_tests/rpl000006.test diff --git a/mysql-test/t/rpl000008-slave.opt b/mysql-test/t/rpl_ignore_table_update-slave.opt similarity index 100% rename from mysql-test/t/rpl000008-slave.opt rename to mysql-test/t/rpl_ignore_table_update-slave.opt diff --git a/mysql-test/t/rpl000008.test b/mysql-test/t/rpl_ignore_table_update.test similarity index 100% rename from mysql-test/t/rpl000008.test rename to mysql-test/t/rpl_ignore_table_update.test diff --git a/mysql-test/t/rpl000009-slave.opt b/mysql-test/t/rpl_load_from_master-slave.opt similarity index 100% rename from mysql-test/t/rpl000009-slave.opt rename to mysql-test/t/rpl_load_from_master-slave.opt diff --git a/mysql-test/t/rpl000009.test b/mysql-test/t/rpl_load_from_master.test similarity index 89% rename from mysql-test/t/rpl000009.test rename to mysql-test/t/rpl_load_from_master.test index 9de075efeaf..eabae3ed399 100644 --- a/mysql-test/t/rpl000009.test +++ b/mysql-test/t/rpl_load_from_master.test @@ -4,10 +4,7 @@ # Change Author: JBM # Change Date: 2006-02-02 # Change: Added ENGINE=MyISAM -# Reason: NDB engine does not support sql_log_bin and the test is testing -# Different replication features. It is better that the test not be -# skipped due to NDB being default engine so that NDB will be used for -# Some of the testing when default is set to NDB +# Reason: LOAD from master is only supported by MyISAM ################################################################# source include/master-slave.inc; @@ -28,12 +25,12 @@ save_master_pos; connection slave; sync_with_master; create database mysqltest2; -create table mysqltest2.foo (n int); +create table mysqltest2.foo (n int)ENGINE=MyISAM; insert into mysqltest2.foo values(4); connection master; -create table mysqltest2.foo (n int); +create table mysqltest2.foo (n int)ENGINE=MyISAM; insert into mysqltest2.foo values(5); -create table mysqltest.bar (m int); +create table mysqltest.bar (m int)ENGINE=MyISAM; insert into mysqltest.bar values(15); save_master_pos; connection slave; @@ -78,21 +75,21 @@ show databases; # Create mysqltest2 and mysqltest3 on slave; we expect that LOAD DATA FROM # MASTER will neither touch database mysqltest nor mysqltest3 create database mysqltest2; -create table mysqltest2.t1(n int, s char(20)); +create table mysqltest2.t1(n int, s char(20))ENGINE=MyISAM; insert into mysqltest2.t1 values (1, 'original foo.t1'); -create table mysqltest2.t3(n int, s char(20)); +create table mysqltest2.t3(n int, s char(20))ENGINE=MyISAM; insert into mysqltest2.t3 values (1, 'original foo.t3'); create database mysqltest3; -create table mysqltest3.t1(n int, s char(20)); +create table mysqltest3.t1(n int, s char(20))ENGINE=MyISAM; insert into mysqltest3.t1 values (1, 'original foo2.t1'); # Create mysqltest, and mysqltest.t1, to check that it gets replaced, # and mysqltest.t3 to check that it is not touched (there is no # mysqltest.t3 on master) create database mysqltest; -create table mysqltest.t1(n int, s char(20)); +create table mysqltest.t1(n int, s char(20))ENGINE=MyISAM; insert into mysqltest.t1 values (1, 'original bar.t1'); -create table mysqltest.t3(n int, s char(20)); +create table mysqltest.t3(n int, s char(20))ENGINE=MyISAM; insert into mysqltest.t3 values (1, 'original bar.t3'); load data from master; diff --git a/mysql-test/t/rpl_load_table_from_master.test b/mysql-test/t/rpl_load_table_from_master.test new file mode 100644 index 00000000000..c1397a175d9 --- /dev/null +++ b/mysql-test/t/rpl_load_table_from_master.test @@ -0,0 +1,93 @@ +########################################################### +# Change Author: JBM +# Change Date: 2006-2-2 +# Change: Added ENGINE=$engine_type for first create table +# Reason: Only MyISAM supports load from master no need to +# run test case for other engines, in addition test will +# fail if other engines are set as default engine +########################################################### +# Change Author: JBM +# Change Date: 2006-2-3 +# Change: removed ENGINE=$engine_type for first create table +# and renamed test file to rpl_load_table_from_master.test. +# In addition added test requirements. +# Reason: Request from review. +############################################################ +# REQUIREMENT TEST 1: +# LOAD TABLE FROM MASTER must work with a forced timestamp. +# +# REQUIREMENTi TEST 2: +#LOAD TABLE FROM MASTER must work with table checksum +############################################################ +# +# Test forced timestamp +# +-- 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; +eval CREATE TABLE t1(t TIMESTAMP NOT NULL,a CHAR(1))ENGINE=MyISAM; +INSERT INTO t1 ( a) VALUE ('F'); +select unix_timestamp(t) from t1; +connection slave; +load table t1 from master; +select unix_timestamp(t) from t1; + +# Delete the created table on master and slave +connection master; +set SQL_LOG_BIN=1,timestamp=default; +drop table t1; +save_master_pos; +connection slave; +sync_with_master; +connection master; + +# +# Test copying table with checksum +# + +# Don't log table creating to the slave as we want to test LOAD TABLE +set SQL_LOG_BIN=0; + +eval CREATE TABLE t1 (a INT NOT NULL) ENGINE=MyISAM MAX_ROWS=4000 CHECKSUM=1; +INSERT INTO t1 VALUES (1); +save_master_pos; +connection slave; +sync_with_master; +load table t1 from master; +check table t1; +drop table t1; +connection master; +drop table t1; +save_master_pos; +connection slave; +sync_with_master; + +connection master; +set SQL_LOG_BIN=0; +create table t1 (word char(20) not null, index(word))ENGINE=MyISAM; +load data infile '../../std_data/words.dat' into table t1; +create table t2 (word char(20) not null)ENGINE=MyISAM; +load data infile '../../std_data/words.dat' into table t2; +create table t3 (word char(20) not null primary key)ENGINE=MyISAM; +connection slave; +load table t1 from master; +load table t2 from master; +load table t3 from master; +check table t1; +select count(*) from t2; +select count(*) from t3; +connection master; +set SQL_LOG_BIN=1; +drop table if exists t1,t2,t3; +save_master_pos; +connection slave; +sync_with_master; +create table t1(n int); +drop table t1; + + + + + +# End of 4.1 tests diff --git a/mysql-test/t/rpl000002.test b/mysql-test/t/rpl_mixed_ddl_dml.test similarity index 100% rename from mysql-test/t/rpl000002.test rename to mysql-test/t/rpl_mixed_ddl_dml.test diff --git a/mysql-test/t/rpl_ndb_relay_space.test b/mysql-test/t/rpl_ndb_relay_space.test index 93b918daab6..0484d807996 100644 --- a/mysql-test/t/rpl_ndb_relay_space.test +++ b/mysql-test/t/rpl_ndb_relay_space.test @@ -1,6 +1,20 @@ -################################## -# Wrapper rpl_sv_relay_space.test# -################################## +################################### +# Wrapper rpl_sv_relay_space.test # +# This test has to be wrapped as # +# It tests ndb, innodb and MyISAM.# +# By Wrapping we are saving some # +# space and making the test more # +# Maintainable by only having one # +# test file and reusing the code # +# In Addition, INNODB has to have # +# Option files during this test # +# to force innodb on the slave # +# else the test will fail # +################################### +#Change Author: JBM # +#Change Date: 2006-02-03 # +#Change: Added Comments # +################################### --source include/have_ndb.inc let $engine_type=NDB; -- source extra/rpl_tests/rpl_sv_relay_space.test diff --git a/mysql-test/t/rpl_relay_space_innodb.test b/mysql-test/t/rpl_relay_space_innodb.test index 33bcc00bbf9..90276d87523 100644 --- a/mysql-test/t/rpl_relay_space_innodb.test +++ b/mysql-test/t/rpl_relay_space_innodb.test @@ -1,6 +1,20 @@ -################################## -# Wrapper rpl_sv_relay_space.test# -################################## +################################### +# Wrapper rpl_sv_relay_space.test # +# This test has to be wrapped as # +# It tests ndb, innodb and MyISAM.# +# By Wrapping we are saving some # +# space and making the test more # +# Maintainable by only having one # +# test file and reusing the code # +# In Addition, INNODB has to have # +# Option files during this test # +# to force innodb on the slave # +# else the test will fail # +################################### +#Change Author: JBM # +#Change Date: 2006-02-03 # +#Change: Added Comments # +################################### -- source include/have_innodb.inc let $engine_type=InnoDB; -- source extra/rpl_tests/rpl_sv_relay_space.test diff --git a/mysql-test/t/rpl_relay_space_myisam.test b/mysql-test/t/rpl_relay_space_myisam.test index 05bcba54c48..cb129f7c87a 100644 --- a/mysql-test/t/rpl_relay_space_myisam.test +++ b/mysql-test/t/rpl_relay_space_myisam.test @@ -1,6 +1,20 @@ -################################## -# Wrapper rpl_sv_relay_space.test# -################################## +################################### +# Wrapper rpl_sv_relay_space.test # +# This test has to be wrapped as # +# It tests ndb, innodb and MyISAM.# +# By Wrapping we are saving some # +# space and making the test more # +# Maintainable by only having one # +# test file and reusing the code # +# In Addition, INNODB has to have # +# Option files during this test # +# to force innodb on the slave # +# else the test will fail # +################################### +#Change Author: JBM # +#Change Date: 2006-02-03 # +#Change: Added Comments # +################################### let $engine_type=MyISAM; -- source extra/rpl_tests/rpl_sv_relay_space.test diff --git a/mysql-test/t/rpl_000012.test b/mysql-test/t/rpl_temp_table.test similarity index 93% rename from mysql-test/t/rpl_000012.test rename to mysql-test/t/rpl_temp_table.test index 17f1d38dbae..c29fa8e676d 100644 --- a/mysql-test/t/rpl_000012.test +++ b/mysql-test/t/rpl_temp_table.test @@ -1,7 +1,7 @@ # drop table t1 t2 t3 are included int master-slave.inc -# Like rpl000013, meaningful only in statement-based: +# meaningful only in statement-based: + -- source include/have_binlog_format_statement.inc -# Should work on both stm and row -- source include/master-slave.inc -- 2.30.9