| List: | Commits | « Previous MessageNext Message » | |
| From: | Jonathan Miller | Date: | February 3 2006 1:59am |
| Subject: | bk commit into 5.1 tree (jmiller:1.2132) | ||
| 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.2132 06/02/03 01:59:02 jmiller@stripped +24 -0 First set of rpl test updated for NDB and general test cleanup mysql-test/t/disabled.def 1.54 06/02/03 01:58:12 jmiller@stripped +1 -1 Updated mysql-test/r/rpl_ndb_auto_inc.result 1.1 06/02/03 01:56:04 jmiller@stripped +185 -0 New wrapper for NDB mysql-test/r/rpl_ndb_auto_inc.result 1.0 06/02/03 01:56:04 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/rpl_ndb_auto_inc.result mysql-test/t/rpl_ndb_auto_inc-master.opt 1.1 06/02/03 01:55:35 jmiller@stripped +1 -0 New wrapper for NDB mysql-test/t/rpl_ndb_auto_inc-master.opt 1.0 06/02/03 01:55:35 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_ndb_auto_inc-master.opt mysql-test/t/rpl_ndb_auto_inc.test 1.1 06/02/03 01:55:28 jmiller@stripped +7 -0 New wrapper for NDB mysql-test/t/rpl_ndb_auto_inc.test 1.0 06/02/03 01:55:28 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_ndb_auto_inc.test mysql-test/extra/rpl_tests/rpl_auto_increment.test 1.3 06/02/03 01:54:45 jmiller@stripped +2 -7 Sorry, forgot to cleanup from debugging mysql-test/extra/rpl_tests/rpl_auto_increment.test 1.2 06/02/03 01:48:57 jmiller@stripped +7 -2 updated to ensure passing when default engine is used mysql-test/t/rpl_auto_increment-slave.opt 1.1 06/02/03 01:48:19 jmiller@stripped +1 -0 needed to ensure test does not fail if default engine is specified mysql-test/t/rpl_auto_increment-slave.opt 1.0 06/02/03 01:48:19 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_auto_increment-slave.opt mysql-test/r/rpl_LD_INFILE.result 1.2 06/02/02 22:41:34 jmiller@stripped +100 -104 Plan test cleanup mysql-test/t/rpl_LD_INFILE.test 1.2 06/02/02 22:41:20 jmiller@stripped +2 -6 Plan test cleanup mysql-test/r/rpl000009.result 1.25 06/02/02 20:06:29 jmiller@stripped +4 -4 updated to work when ndb is default engine mysql-test/t/rpl000009.test 1.25 06/02/02 20:05:30 jmiller@stripped +13 -4 updated to work when ndb is default engine mysql-test/r/rpl_relay_space_ndb.result 1.1 06/02/02 19:35:50 jmiller@stripped +25 -0 Result file for wrapper for old test case called rpl000009.test mysql-test/r/rpl_relay_space_innodb.result 1.1 06/02/02 19:35:50 jmiller@stripped +25 -0 Result file for wrapper for old test case called rpl000009.test mysql-test/r/rpl_relay_space_ndb.result 1.0 06/02/02 19:35:50 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/rpl_relay_space_ndb.result mysql-test/r/rpl_relay_space_innodb.result 1.0 06/02/02 19:35:50 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/rpl_relay_space_innodb.result mysql-test/r/rpl_ndb_relay_space.result 1.1 06/02/02 19:35:41 jmiller@stripped +25 -0 Result file for wrapper for old test case called rpl000009.test mysql-test/r/rpl_ndb_relay_space.result 1.0 06/02/02 19:35:41 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/rpl_ndb_relay_space.result mysql-test/t/rpl_ndb_relay_space.test 1.1 06/02/02 19:35:05 jmiller@stripped +7 -0 Wrapper for old test case called rpl000009.test mysql-test/t/rpl_ndb_relay_space.test 1.0 06/02/02 19:35:05 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_ndb_relay_space.test mysql-test/t/rpl_relay_space_myisam.test 1.1 06/02/02 19:34:47 jmiller@stripped +6 -0 Wrapper for old test case called rpl000009.test mysql-test/t/rpl_relay_space_innodb.test 1.1 06/02/02 19:34:47 jmiller@stripped +7 -0 Wrapper for old test case called rpl000009.test mysql-test/t/rpl_relay_space_innodb-slave.opt 1.1 06/02/02 19:34:47 jmiller@stripped +1 -0 Wrapper for old test case called rpl000009.test mysql-test/t/rpl_relay_space_innodb-master.opt 1.1 06/02/02 19:34:47 jmiller@stripped +1 -0 Wrapper for old test case called rpl000009.test mysql-test/t/rpl_relay_space_myisam.test 1.0 06/02/02 19:34:47 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_relay_space_myisam.test mysql-test/t/rpl_relay_space_innodb.test 1.0 06/02/02 19:34:47 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_relay_space_innodb.test mysql-test/t/rpl_relay_space_innodb-slave.opt 1.0 06/02/02 19:34:47 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_relay_space_innodb-slave.opt mysql-test/t/rpl_relay_space_innodb-master.opt 1.0 06/02/02 19:34:47 jmiller@stripped +0 -0 BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_relay_space_innodb-master.opt mysql-test/extra/rpl_tests/rpl_sv_relay_space.test 1.17 06/02/02 19:33:26 jmiller@stripped +5 -1 Had to split the test cases out to use for each engine. Reason being that the data goes applies to ndb in different order. So it has to have its own result file and I want to ensure that it is not used for other tests when ndb is used as default engine. Old test case was called rpl000009.test, so it was renamed as well to give the test more meaning mysql-test/r/rpl_relay_space_myisam.result 1.14 06/02/02 19:14:45 jmiller@stripped +0 -0 Rename: mysql-test/r/rpl000005.result -> mysql-test/r/rpl_relay_space_myisam.result mysql-test/extra/rpl_tests/rpl_sv_relay_space.test 1.16 06/02/02 19:07:05 jmiller@stripped +0 -0 Rename: mysql-test/t/rpl000005.test -> mysql-test/extra/rpl_tests/rpl_sv_relay_space.test mysql-test/r/rpl000006.result 1.14 06/02/02 16:44:39 jmiller@stripped +1 -1 Updated test so that it would not fail when other engines are set as default engine mysql-test/extra/rpl_tests/rpl000006.test 1.2 06/02/02 16:44:22 jmiller@stripped +9 -1 Updated test so that it would not fail when other engines are set as default engine mysql-test/r/rpl000004.result 1.8 06/02/02 16:39:14 jmiller@stripped +3 -3 Updated test so it would not fail when MyISAM was not default Engine mysql-test/t/rpl000004.test 1.14 06/02/02 16:34:15 jmiller@stripped +11 -3 Updated test so it would not fail when MyISAM was not default Engine # 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 --- New file --- +++ mysql-test/r/rpl_ndb_auto_inc.result 06/02/03 01:56: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; create table t1 (a int not null auto_increment,b int, primary key (a)) engine=myisam auto_increment=3; insert into t1 values (NULL,1),(NULL,2),(NULL,3); select * from t1; a b 12 1 22 2 32 3 select * from t1; a b 12 1 22 2 32 3 drop table t1; create table t1 (a int not null auto_increment,b int, primary key (a)) engine=myisam; 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); select * from t1; a b 1 1 2 2 3 3 22 5 32 6 select * from t1; a b 1 1 2 2 3 3 22 5 32 6 drop table t1; set @@session.auto_increment_increment=100, @@session.auto_increment_offset=10; show variables like "%auto_inc%"; Variable_name Value auto_increment_increment 100 auto_increment_offset 10 create table t1 (a int not null auto_increment, primary key (a)) engine=myisam; insert into t1 values (NULL),(5),(NULL); insert into t1 values (250),(NULL); select * from t1; a 5 10 110 250 310 insert into t1 values (1000); set @@insert_id=400; insert into t1 values(NULL),(NULL); select * from t1; a 5 10 110 250 310 400 410 1000 select * from t1; a 5 10 110 250 310 400 410 1000 drop table t1; create table t1 (a int not null auto_increment, primary key (a)) engine=innodb; insert into t1 values (NULL),(5),(NULL); insert into t1 values (250),(NULL); select * from t1; a 5 10 110 250 310 insert into t1 values (1000); set @@insert_id=400; insert into t1 values(NULL),(NULL); select * from t1; a 5 10 110 250 310 400 410 1000 select * from t1; a 5 10 110 250 310 400 410 1000 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; insert into t1 values (NULL),(5),(NULL),(NULL); insert into t1 values (500),(NULL),(502),(NULL),(NULL); select * from t1; a 1 5 6 7 500 501 502 503 504 set @@insert_id=600; insert into t1 values(600),(NULL),(NULL); ERROR 23000: Duplicate entry '600' for key 1 set @@insert_id=600; insert ignore into t1 values(600),(NULL),(NULL),(610),(NULL); select * from t1; a 1 5 6 7 500 501 502 503 504 600 610 611 select * from t1; a 1 5 6 7 500 501 502 503 504 600 610 611 drop table t1; 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; insert into t1 values(2),(12),(22),(32),(42); insert into t1 values (NULL),(NULL); insert into t1 values (3),(NULL),(NULL); select * from t1; a 1 3 11 21 31 select * from t1; a 1 2 3 11 12 21 22 31 32 42 drop table t1; --- New file --- +++ mysql-test/r/rpl_ndb_relay_space.result 06/02/02 19:35: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; 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=NDB; 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 Caleb 1 00000002 Jacob 2 00000003 SELECT * FROM t1 ORDER BY id; name age id Andy 31 00000001 Caleb 1 00000002 Jacob 2 00000003 drop table t1; --- New file --- +++ mysql-test/r/rpl_relay_space_innodb.result 06/02/02 19:35:50 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=InnoDB; 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; --- New file --- +++ mysql-test/r/rpl_relay_space_ndb.result 06/02/02 19:35:50 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; --- New file --- +++ mysql-test/t/rpl_auto_increment-slave.opt 06/02/03 01:48:19 --innodb --- New file --- +++ mysql-test/t/rpl_ndb_auto_inc-master.opt 06/02/03 01:55:35 --auto-increment-increment=10 --auto-increment-offset=2 --- New file --- +++ mysql-test/t/rpl_ndb_auto_inc.test 06/02/03 01:55:28 ##################################### # Wrapper for rpl_auto_increment.test# ##################################### -- source include/have_innodb.inc let $engine_type=NDB; let $engine_type2=myisam; -- source extra/rpl_tests/rpl_auto_increment.test --- New file --- +++ mysql-test/t/rpl_ndb_relay_space.test 06/02/02 19:35:05 ################################## # Wrapper rpl_sv_relay_space.test# ################################## --source include/have_ndb.inc let $engine_type=NDB; -- source extra/rpl_tests/rpl_sv_relay_space.test --- New file --- +++ mysql-test/t/rpl_relay_space_innodb-master.opt 06/02/02 19:34:47 --innodb --- New file --- +++ mysql-test/t/rpl_relay_space_innodb-slave.opt 06/02/02 19:34:47 --innodb --- New file --- +++ mysql-test/t/rpl_relay_space_innodb.test 06/02/02 19:34:47 ################################## # Wrapper rpl_sv_relay_space.test# ################################## -- source include/have_innodb.inc let $engine_type=InnoDB; -- source extra/rpl_tests/rpl_sv_relay_space.test --- New file --- +++ mysql-test/t/rpl_relay_space_myisam.test 06/02/02 19:34:47 ################################## # Wrapper rpl_sv_relay_space.test# ################################## let $engine_type=MyISAM; -- source extra/rpl_tests/rpl_sv_relay_space.test --- 1.53/mysql-test/t/disabled.def 2006-02-02 06:37:33 +01:00 +++ 1.54/mysql-test/t/disabled.def 2006-02-03 01:58:12 +01:00 @@ -25,7 +25,6 @@ ndb_binlog_basic : Results are not deterministic, Tomas will fix rpl_ndb_basic : Bug#16228 rpl_sp : Bug #16456 -#ndb_dd_disk2memory : Bug #16466 ndb_autodiscover : Needs to be fixed w.r.t binlog ndb_autodiscover2 : Needs to be fixed w.r.t binlog ndb_blob : BLOB replication causes core in master1 (Pekka will fix) @@ -33,5 +32,6 @@ 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 # vim: set filetype=conf: --- 1.1/mysql-test/extra/rpl_tests/rpl000006.test 2005-12-22 06:34:50 +01:00 +++ 1.2/mysql-test/extra/rpl_tests/rpl000006.test 2006-02-02 16:44:22 +01:00 @@ -1,3 +1,11 @@ +########################################################### +# 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 # @@ -5,7 +13,7 @@ # Don't log table creating to the slave as we want to test LOAD TABLE set SQL_LOG_BIN=0,timestamp=200006; -create table t1(t timestamp not null,a char(1)); +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; --- 1.1/mysql-test/r/rpl_LD_INFILE.result 2005-12-22 06:34:51 +01:00 +++ 1.2/mysql-test/r/rpl_LD_INFILE.result 2006-02-02 22:41:34 +01:00 @@ -4,118 +4,114 @@ 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 VARCHAR(255), PRIMARY KEY(a)); LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1; DELETE FROM test.t1 WHERE a = 'abashed'; DELETE FROM test.t1; LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1; -SELECT * FROM test.t1; +SELECT * FROM test.t1 ORDER BY a DESC; a -abase -abased -abasement -abasements -abases -abash -abashed -abashes -abashing -abasing -abate -abated -abatement -abatements -abater -abates -abating -Abba -abbe -abbey -abbeys -abbot -abbots -Abbott -abbreviate -abbreviated -abbreviates -abbreviating -abbreviation -abbreviations -Abby -abdomen -abdomens -abdominal -abduct -abducted -abduction -abductions -abductor -abductors -abducts -Abe -abed -Abel -Abelian -Abelson -Aberdeen -Abernathy -aberrant aberration -SELECT * FROM test.t1; -a -abase -abased -abasement -abasements -abases -abash -abashed -abashes -abashing -abasing -abate -abated -abatement -abatements -abater -abates -abating -Abba -abbe -abbey -abbeys -abbot -abbots -Abbott -abbreviate -abbreviated -abbreviates -abbreviating -abbreviation -abbreviations -Abby -abdomen -abdomens -abdominal -abduct -abducted -abduction -abductions -abductor -abductors -abducts -Abe -abed -Abel -Abelian -Abelson -Aberdeen -Abernathy aberrant +Abernathy +Aberdeen +Abelson +Abelian +Abel +abed +Abe +abducts +abductors +abductor +abductions +abduction +abducted +abduct +abdominal +abdomens +abdomen +Abby +abbreviations +abbreviation +abbreviating +abbreviates +abbreviated +abbreviate +Abbott +abbots +abbot +abbeys +abbey +abbe +Abba +abating +abates +abater +abatements +abatement +abated +abate +abasing +abashing +abashes +abashed +abash +abases +abasements +abasement +abased +abase +SELECT * FROM test.t1 ORDER BY a DESC; +a aberration -DROP PROCEDURE IF EXISTS test.p1; -Warnings: -Note 1305 PROCEDURE p1 does not exist +aberrant +Abernathy +Aberdeen +Abelson +Abelian +Abel +abed +Abe +abducts +abductors +abductor +abductions +abduction +abducted +abduct +abdominal +abdomens +abdomen +Abby +abbreviations +abbreviation +abbreviating +abbreviates +abbreviated +abbreviate +Abbott +abbots +abbot +abbeys +abbey +abbe +Abba +abating +abates +abater +abatements +abatement +abated +abate +abasing +abashing +abashes +abashed +abash +abases +abasements +abasement +abased +abase DROP TABLE test.t1; --- 1.1/mysql-test/t/rpl_LD_INFILE.test 2005-12-22 06:34:59 +01:00 +++ 1.2/mysql-test/t/rpl_LD_INFILE.test 2006-02-02 22:41:20 +01:00 @@ -11,7 +11,6 @@ # Begin clean up test section --disable_warnings connection master; -DROP PROCEDURE IF EXISTS test.p1; DROP TABLE IF EXISTS test.t1; --enable_warnings @@ -23,18 +22,15 @@ LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1; -connection master; -SELECT * FROM test.t1; +SELECT * FROM test.t1 ORDER BY a DESC; save_master_pos; sync_slave_with_master; connection slave; -SELECT * FROM test.t1; - +SELECT * FROM test.t1 ORDER BY a DESC; connection master; # Lets cleanup #show binlog events; -DROP PROCEDURE IF EXISTS test.p1; DROP TABLE test.t1; # End of 5.0 test case --- 1.13/mysql-test/r/rpl000006.result 2003-12-10 05:30:24 +01:00 +++ 1.14/mysql-test/r/rpl000006.result 2006-02-02 16:44:39 +01:00 @@ -5,7 +5,7 @@ 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)); +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) --- 1.24/mysql-test/r/rpl000009.result 2006-01-12 19:50:30 +01:00 +++ 1.25/mysql-test/r/rpl000009.result 2006-02-02 20:06:29 +01:00 @@ -38,12 +38,12 @@ mysqltest mysqltest2 test -create table mysqltest2.t1(n int, s char(20)); -create table mysqltest2.t2(n int, s text); +create table mysqltest2.t1(n int, s char(20))ENGINE=MyISAM; +create table mysqltest2.t2(n int, s text)ENGINE=MyISAM; insert into mysqltest2.t1 values (1, 'one'), (2, 'two'), (3, 'three'); insert into mysqltest2.t2 values (11, 'eleven'), (12, 'twelve'), (13, 'thirteen'); -create table mysqltest.t1(n int, s char(20)); -create table mysqltest.t2(n int, s text); +create table mysqltest.t1(n int, s char(20))ENGINE=MyISAM; +create table mysqltest.t2(n int, s text)ENGINE=MyISAM; insert into mysqltest.t1 values (1, 'one test'), (2, 'two test'), (3, 'three test'); insert into mysqltest.t2 values (11, 'eleven test'), (12, 'twelve test'), (13, 'thirteen test'); --- 1.7/mysql-test/r/rpl000004.result 2003-02-17 04:38:25 +01:00 +++ 1.8/mysql-test/r/rpl000004.result 2006-02-02 16:39:14 +01:00 @@ -5,11 +5,11 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; set SQL_LOG_BIN=0; -create table t1 (word char(20) not null, index(word)); +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); +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); +create table t3 (word char(20) not null primary key)ENGINE=MyISAM; load table t1 from master; load table t2 from master; load table t3 from master; --- 1.13/mysql-test/t/rpl000004.test 2005-07-28 02:21:47 +02:00 +++ 1.14/mysql-test/t/rpl000004.test 2006-02-02 16:34:15 +01:00 @@ -1,11 +1,19 @@ +###################################### +# 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)); +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); +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); +create table t3 (word char(20) not null primary key)ENGINE=MyISAM; connection slave; load table t1 from master; load table t2 from master; --- 1.15/mysql-test/t/rpl000005.test 2006-01-17 20:39:36 +01:00 +++ 1.17/mysql-test/extra/rpl_tests/rpl_sv_relay_space.test 2006-02-02 19:33:26 +01:00 @@ -3,6 +3,10 @@ # Change Date: 2006-01-17 # Change: Added order by in select #################### +# Change Date: 2006-02-02 +# Change: renamed to make bettre sense, +# and wrapped per Engine test +############################ source include/master-slave.inc; # @@ -10,7 +14,7 @@ # SHOW VARIABLES LIKE 'relay_log_space_limit'; -CREATE TABLE t1 (name varchar(64), age smallint(3)); +eval CREATE TABLE t1 (name varchar(64), age smallint(3))ENGINE=$engine_type; INSERT INTO t1 SET name='Andy', age=31; INSERT t1 SET name='Jacob', age=2; INSERT into t1 SET name='Caleb', age=1; --- 1.24/mysql-test/t/rpl000009.test 2005-08-30 21:24:33 +02:00 +++ 1.25/mysql-test/t/rpl000009.test 2006-02-02 20:05:30 +01:00 @@ -1,5 +1,14 @@ # This one assumes we are ignoring updates on tables in database mysqltest2, # but doing the ones in database mysqltest +################################################################# +# 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 +################################################################# source include/master-slave.inc; --disable_warnings @@ -49,13 +58,13 @@ create database mysqltest2; create database mysqltest; show databases; -create table mysqltest2.t1(n int, s char(20)); -create table mysqltest2.t2(n int, s text); +create table mysqltest2.t1(n int, s char(20))ENGINE=MyISAM; +create table mysqltest2.t2(n int, s text)ENGINE=MyISAM; insert into mysqltest2.t1 values (1, 'one'), (2, 'two'), (3, 'three'); insert into mysqltest2.t2 values (11, 'eleven'), (12, 'twelve'), (13, 'thirteen'); -create table mysqltest.t1(n int, s char(20)); -create table mysqltest.t2(n int, s text); +create table mysqltest.t1(n int, s char(20))ENGINE=MyISAM; +create table mysqltest.t2(n int, s text)ENGINE=MyISAM; insert into mysqltest.t1 values (1, 'one test'), (2, 'two test'), (3, 'three test'); insert into mysqltest.t2 values (11, 'eleven test'), (12, 'twelve test'), (13, 'thirteen test');
| Thread | ||
|---|---|---|
| • bk commit into 5.1 tree (jmiller:1.2132) | Jonathan Miller | 3 Feb |
© 1995-2008 MySQL AB. All rights reserved.
Page generated in 0.619 sec. using MySQL 5.1.14-beta-log