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.2133 06/02/03 15:38:27 jmiller@stripped +22 -0
Implemented requested changes by Lars and did some general test cleanup. Lots more togo
mysql-test/r/rpl_temp_table.result
1.15 06/02/03 15:16:57 jmiller@stripped +0 -0
Rename: mysql-test/r/rpl_000012.result -> mysql-test/r/rpl_temp_table.result
mysql-test/t/rpl_temp_table.test
1.20 06/02/03 15:16:28 jmiller@stripped +0 -0
Rename: mysql-test/t/rpl_000012.test -> mysql-test/t/rpl_temp_table.test
mysql-test/t/rpl_000012.test
1.19 06/02/03 15:15:27 jmiller@stripped +2 -2
Test Cleanup
mysql-test/r/rpl_load_from_master.result
1.27 06/02/03 15:06:36 jmiller@stripped +0 -0
Rename: mysql-test/r/rpl000009.result -> mysql-test/r/rpl_load_from_master.result
mysql-test/t/rpl_load_from_master-slave.opt
1.6 06/02/03 15:06:05 jmiller@stripped +0 -0
Rename: mysql-test/t/rpl000009-slave.opt -> mysql-test/t/rpl_load_from_master-slave.opt
mysql-test/t/rpl_load_from_master.test
1.27 06/02/03 15:05:46 jmiller@stripped +0 -0
Rename: mysql-test/t/rpl000009.test -> mysql-test/t/rpl_load_from_master.test
mysql-test/r/rpl000009.result
1.26 06/02/03 15:05:19 jmiller@stripped +8 -8
Updated to use MyISAM only per Lars
mysql-test/t/rpl000009.test
1.26 06/02/03 15:05:09 jmiller@stripped +9 -12
Updated to use MyISAM only per Lars
mysql-test/t/disabled.def
1.56 06/02/03 15:04:34 jmiller@stripped +1 -0
added rpl_ndb_relay_space Results are not deterministic
BitKeeper/deleted/.del-rpl000004.b.result~352b35351551485
1.8 06/02/03 14:25:35 jmiller@stripped +0 -0
Delete: mysql-test/r/rpl000004.b.result
BitKeeper/deleted/.del-rpl000004.a.result~3415f066cb91c460
1.8 06/02/03 14:25:34 jmiller@stripped +0 -0
Delete: mysql-test/r/rpl000004.a.result
mysql-test/t/disabled.def
1.55 06/02/03 14:25:08 jmiller@stripped +1 -1
Removed the .test
mysql-test/r/rpl_load_table_from_master.result
1.16 06/02/03 14:24:16 jmiller@stripped +26 -6
Updated results file
mysql-test/t/rpl_load_table_from_master.test
1.6 06/02/03 14:23:53 jmiller@stripped +27 -0
Fixing test since test where combined
mysql-test/r/rpl_ignore_table_update.result
1.11 06/02/03 13:46:22 jmiller@stripped +0 -0
Rename: mysql-test/r/rpl000008.result -> mysql-test/r/rpl_ignore_table_update.result
mysql-test/t/rpl_ignore_table_update-slave.opt
1.6 06/02/03 13:45:53 jmiller@stripped +0 -0
Rename: mysql-test/t/rpl000008-slave.opt -> mysql-test/t/rpl_ignore_table_update-slave.opt
mysql-test/t/rpl_ignore_table_update.test
1.15 06/02/03 13:45:18 jmiller@stripped +0 -0
Rename: mysql-test/t/rpl000008.test -> mysql-test/t/rpl_ignore_table_update.test
mysql-test/r/rpl_mixed_ddl_dml.result
1.19 06/02/03 13:41:36 jmiller@stripped +0 -0
Rename: mysql-test/r/rpl000002.result -> mysql-test/r/rpl_mixed_ddl_dml.result
mysql-test/t/rpl_mixed_ddl_dml.test
1.22 06/02/03 13:41:09 jmiller@stripped +0 -0
Rename: mysql-test/t/rpl000002.test -> mysql-test/t/rpl_mixed_ddl_dml.test
BitKeeper/deleted/.del-rpl000004.result~a3147834a662043a
1.9 06/02/03 13:36:15 jmiller@stripped +0 -0
Delete: mysql-test/r/rpl000004.result
BitKeeper/deleted/.del-rpl000004.test~61532b03f9ad2734
1.15 06/02/03 13:35:43 jmiller@stripped +0 -0
Delete: mysql-test/t/rpl000004.test
mysql-test/t/rpl_load_table_from_master.test
1.5 06/02/03 13:31:27 jmiller@stripped +4 -6
needed to change out the for MyISAM
mysql-test/t/rpl_load_table_from_master.test
1.4 06/02/03 13:28:07 jmiller@stripped +13 -0
updated and added comments + renamed test case
mysql-test/r/rpl_load_table_from_master.result
1.15 06/02/03 13:27:32 jmiller@stripped +0 -0
Rename: mysql-test/r/rpl000006.result -> mysql-test/r/rpl_load_table_from_master.result
mysql-test/t/rpl_load_table_from_master.test
1.3 06/02/03 13:22:36 jmiller@stripped +0 -0
Rename: mysql-test/extra/rpl_tests/rpl000006.test -> mysql-test/t/rpl_load_table_from_master.test
BitKeeper/deleted/.del-rpl000006.test~6da9f1808deb79c7
1.17 06/02/03 13:21:54 jmiller@stripped +0 -0
Delete: mysql-test/t/rpl000006.test
mysql-test/t/rpl_relay_space_innodb.test
1.2 06/02/03 13:16:20 jmiller@stripped +17 -3
Added Comment
BitKeeper/deleted/.del-rpl_relay_space_ndb.result~4d6013c0afef9b5e
1.2 06/02/03 13:03:28 jmiller@stripped +0 -0
Delete: mysql-test/r/rpl_relay_space_ndb.result
mysql-test/t/rpl_ndb_relay_space.test
1.3 06/02/03 13:02:07 jmiller@stripped +4 -0
Added more comments
mysql-test/t/rpl_relay_space_myisam.test
1.2 06/02/03 13:01:40 jmiller@stripped +17 -3
Added Comment
mysql-test/t/rpl_ndb_relay_space.test
1.2 06/02/03 12:57:36 jmiller@stripped +13 -3
Added comments
# 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.1/mysql-test/t/rpl_ndb_relay_space.test 2006-02-02 19:35:05 +01:00
+++ 1.3/mysql-test/t/rpl_ndb_relay_space.test 2006-02-03 13:02:07 +01:00
@@ -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
--- 1.1/mysql-test/t/rpl_relay_space_innodb.test 2006-02-02 19:34:47 +01:00
+++ 1.2/mysql-test/t/rpl_relay_space_innodb.test 2006-02-03 13:16:20 +01:00
@@ -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
--- 1.1/mysql-test/t/rpl_relay_space_myisam.test 2006-02-02 19:34:47 +01:00
+++ 1.2/mysql-test/t/rpl_relay_space_myisam.test 2006-02-03 13:01:40 +01:00
@@ -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
--- 1.54/mysql-test/t/disabled.def 2006-02-03 01:58:12 +01:00
+++ 1.56/mysql-test/t/disabled.def 2006-02-03 15:04:34 +01:00
@@ -32,6 +32,7 @@
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:
--- 1.2/mysql-test/extra/rpl_tests/rpl000006.test 2006-02-02 16:44:22 +01:00
+++ 1.6/mysql-test/t/rpl_load_table_from_master.test 2006-02-03 14:23:53 +01:00
@@ -6,15 +6,28 @@
# 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=$engine_type;
-insert into t1 ( a) values ('F');
+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;
@@ -36,9 +49,7 @@
# 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;
+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;
@@ -51,5 +62,32 @@
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
--- 1.14/mysql-test/r/rpl000006.result 2006-02-02 16:44:39 +01:00
+++ 1.16/mysql-test/r/rpl_load_table_from_master.result 2006-02-03 14:24:16 +01:00
@@ -4,9 +4,9 @@
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');
+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
@@ -17,13 +17,33 @@
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;
+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;
+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;
+load table t1 from master;
+load table t2 from master;
+load table t3 from master;
+check table t1;
+Table Op Msg_type Msg_text
+test.t1 check status OK
+select count(*) from t2;
+count(*)
+70
+select count(*) from t3;
+count(*)
+0
+set SQL_LOG_BIN=1;
+drop table if exists t1,t2,t3;
+create table t1(n int);
drop table t1;
--- 1.25/mysql-test/r/rpl000009.result 2006-02-02 20:06:29 +01:00
+++ 1.27/mysql-test/r/rpl_load_from_master.result 2006-02-03 15:06:36 +01:00
@@ -13,11 +13,11 @@
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 @@
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;
--- 1.25/mysql-test/t/rpl000009.test 2006-02-02 20:05:30 +01:00
+++ 1.27/mysql-test/t/rpl_load_from_master.test 2006-02-03 15:05:46 +01:00
@@ -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 @@
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 @@
# 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;
--- 1.18/mysql-test/t/rpl_000012.test 2005-12-22 05:10:59 +01:00
+++ 1.20/mysql-test/t/rpl_temp_table.test 2006-02-03 15:16:28 +01:00
@@ -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
| Thread |
|---|
| • bk commit into 5.1 tree (jmiller:1.2133) | Jonathan Miller | 3 Feb |
