| List: | Internals | « Previous MessageNext Message » | |
| From: | tomas | Date: | April 29 2005 2:45am |
| Subject: | bk commit into 5.1 tree (tomas:1.1828) | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 5.1 repository of tomas. When tomas 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.1828 05/04/29 02:45:22 tomas@stripped +36 -0 restore to skip cluster_replication/def/apply_status test fixes for mysql version and row-based apply_status needs only hash index storage/ndb/tools/restore/restore_main.cpp 1.31 05/04/29 02:45:17 tomas@stripped +2 -1 restore to skip cluster_replication/def/apply_status sql/ha_ndbcluster.cc 1.228 05/04/29 02:45:17 tomas@stripped +1 -1 apply_status needs only hash index mysql-test/t/user_var.test 1.28 05/04/29 02:45:17 tomas@stripped +3 -0 test fixes for mysql version and row-based mysql-test/t/user_var-binlog.test 1.3 05/04/29 02:45:17 tomas@stripped +3 -0 test fixes for mysql version and row-based mysql-test/t/rpl_until.test 1.19 05/04/29 02:45:17 tomas@stripped +3 -0 test fixes for mysql version and row-based mysql-test/t/rpl_temporary.test 1.15 05/04/29 02:45:17 tomas@stripped +3 -0 test fixes for mysql version and row-based mysql-test/t/rpl_row_trans.test 1.3 05/04/29 02:45:17 tomas@stripped +3 -0 test fixes for mysql version and row-based mysql-test/t/rpl_row_basic_myisam.test 1.9 05/04/29 02:45:17 tomas@stripped +9 -3 test fixes for mysql version and row-based mysql-test/t/rpl_row_basic_innodb.test 1.3 05/04/29 02:45:17 tomas@stripped +5 -0 test fixes for mysql version and row-based mysql-test/t/rpl_rotate_logs.test 1.61 05/04/29 02:45:17 tomas@stripped +3 -0 test fixes for mysql version and row-based mysql-test/t/rpl_multi_query.test 1.8 05/04/29 02:45:17 tomas@stripped +3 -0 test fixes for mysql version and row-based mysql-test/t/rpl_max_relay_size.test 1.13 05/04/29 02:45:17 tomas@stripped +3 -0 test fixes for mysql version and row-based mysql-test/t/rpl_log_pos.test 1.36 05/04/29 02:45:17 tomas@stripped +4 -0 test fixes for mysql version and row-based mysql-test/t/rpl_log.test 1.28 05/04/29 02:45:17 tomas@stripped +3 -0 test fixes for mysql version and row-based mysql-test/t/rpl_loaddata_rule_s.test 1.9 05/04/29 02:45:17 tomas@stripped +3 -0 test fixes for mysql version and row-based mysql-test/t/rpl_loaddata_rule_m.test 1.11 05/04/29 02:45:17 tomas@stripped +3 -0 test fixes for mysql version and row-based mysql-test/t/rpl_loaddata.test 1.17 05/04/29 02:45:17 tomas@stripped +3 -0 test fixes for mysql version and row-based mysql-test/t/rpl_heap.test 1.5 05/04/29 02:45:17 tomas@stripped +3 -0 test fixes for mysql version and row-based mysql-test/t/rpl_error_ignored_table.test 1.16 05/04/29 02:45:17 tomas@stripped +3 -0 test fixes for mysql version and row-based mysql-test/t/rpl_create_database.test 1.4 05/04/29 02:45:17 tomas@stripped +3 -0 test fixes for mysql version and row-based mysql-test/t/rpl_charset.test 1.18 05/04/29 02:45:17 tomas@stripped +3 -0 test fixes for mysql version and row-based mysql-test/t/rpl000015.test 1.31 05/04/29 02:45:16 tomas@stripped +3 -0 test fixes for mysql version and row-based mysql-test/t/ndb_rpl_multi.test 1.9 05/04/29 02:45:16 tomas@stripped +31 -16 test fixes for mysql version and row-based mysql-test/t/insert_select-binlog.test 1.3 05/04/29 02:45:16 tomas@stripped +1 -0 test fixes for mysql version and row-based mysql-test/t/flush_block_commit.test 1.7 05/04/29 02:45:16 tomas@stripped +3 -0 test fixes for mysql version and row-based mysql-test/t/drop_temp_table.test 1.6 05/04/29 02:45:16 tomas@stripped +3 -0 test fixes for mysql version and row-based mysql-test/t/ctype_ucs_binlog.test 1.5 05/04/29 02:45:16 tomas@stripped +3 -0 test fixes for mysql version and row-based mysql-test/t/ctype_ucs.test 1.31 05/04/29 02:45:16 tomas@stripped +3 -0 test fixes for mysql version and row-based mysql-test/r/rpl_row_trans.result 1.3 05/04/29 02:45:16 tomas@stripped +1 -1 test fixes for mysql version and row-based mysql-test/r/rpl_row_basic_myisam.result 1.9 05/04/29 02:45:16 tomas@stripped +2 -2 test fixes for mysql version and row-based mysql-test/r/rpl_row_basic_innodb.result 1.3 05/04/29 02:45:16 tomas@stripped +1 -1 test fixes for mysql version and row-based mysql-test/r/rpl_row_basic_7ndb.result 1.6 05/04/29 02:45:16 tomas@stripped +4 -4 test fixes for mysql version and row-based mysql-test/r/rpl_row_basic_3innodb.result 1.4 05/04/29 02:45:16 tomas@stripped +4 -4 test fixes for mysql version and row-based mysql-test/r/rpl_row_basic_2myisam.result 1.2 05/04/29 02:45:16 tomas@stripped +4 -4 test fixes for mysql version and row-based mysql-test/r/ndb_rpl_multi.result 1.6 05/04/29 02:45:16 tomas@stripped +31 -20 test fixes for mysql version and row-based mysql-test/include/rpl_row_basic.inc 1.3 05/04/29 02:45:16 tomas@stripped +7 -0 test fixes for mysql version and row-based # 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: tomas # Host: poseidon.ndb.mysql.com # Root: /home/tomas/wl2325 --- 1.30/mysql-test/t/ctype_ucs.test 2005-04-14 14:42:58 +02:00 +++ 1.31/mysql-test/t/ctype_ucs.test 2005-04-29 02:45:16 +02:00 @@ -1,3 +1,6 @@ +# Requires statement logging +-- source include/have_binlog_format_statement.inc + -- source include/have_ucs2.inc --disable_warnings --- 1.18/mysql-test/t/rpl_until.test 2005-04-08 18:40:59 +02:00 +++ 1.19/mysql-test/t/rpl_until.test 2005-04-29 02:45:17 +02:00 @@ -1,3 +1,6 @@ +# Requires statement logging +-- source include/have_binlog_format_statement.inc + source include/master-slave.inc; # prepare version for substitutions --- 1.5/mysql-test/t/drop_temp_table.test 2005-03-31 03:32:41 +02:00 +++ 1.6/mysql-test/t/drop_temp_table.test 2005-04-29 02:45:16 +02:00 @@ -1,3 +1,6 @@ +# Requires statement logging +-- source include/have_binlog_format_statement.inc + # Embedded server doesn't support binlog -- source include/not_embedded.inc --- 1.6/mysql-test/t/flush_block_commit.test 2005-04-12 16:11:19 +02:00 +++ 1.7/mysql-test/t/flush_block_commit.test 2005-04-29 02:45:16 +02:00 @@ -3,6 +3,9 @@ # We verify that we did not introduce a deadlock. # This is intended to mimick how mysqldump and innobackup work. +# Requires statement logging +-- source include/have_binlog_format_statement.inc + # This test doesn't work with the embedded server -- source include/not_embedded.inc --- 1.17/mysql-test/t/rpl_charset.test 2005-04-01 13:32:24 +02:00 +++ 1.18/mysql-test/t/rpl_charset.test 2005-04-29 02:45:17 +02:00 @@ -1,6 +1,9 @@ # Replication of character sets. # This test will fail if the server/client does not support enough charsets. +# Requires statement logging +-- source include/have_binlog_format_statement.inc + source include/master-slave.inc; --disable_warnings set timestamp=1000000000; --- 1.15/mysql-test/t/rpl_error_ignored_table.test 2005-04-01 13:32:25 +02:00 +++ 1.16/mysql-test/t/rpl_error_ignored_table.test 2005-04-29 02:45:17 +02:00 @@ -2,6 +2,9 @@ # Bug #797: If a query is ignored on slave (replicate-ignore-table) the slave # still checks that it has the same error as on the master. +# Requires statement logging +-- source include/have_binlog_format_statement.inc + source include/master-slave.inc; connection master; create table t1 (a int primary key); --- 1.4/mysql-test/t/rpl_heap.test 2004-09-05 01:36:28 +02:00 +++ 1.5/mysql-test/t/rpl_heap.test 2005-04-29 02:45:17 +02:00 @@ -1,3 +1,6 @@ +# Requires statement logging +-- source include/have_binlog_format_statement.inc + # You must run this test with --manager. require_manager; --- 1.10/mysql-test/t/rpl_loaddata_rule_m.test 2005-04-01 13:32:25 +02:00 +++ 1.11/mysql-test/t/rpl_loaddata_rule_m.test 2005-04-29 02:45:17 +02:00 @@ -2,6 +2,9 @@ # exist. # This is for BUG#1100 (LOAD DATA INFILE was half-logged). +# Requires statement logging +-- source include/have_binlog_format_statement.inc + source include/master-slave.inc; --disable_warnings --- 1.8/mysql-test/t/rpl_loaddata_rule_s.test 2005-04-01 13:32:25 +02:00 +++ 1.9/mysql-test/t/rpl_loaddata_rule_s.test 2005-04-29 02:45:17 +02:00 @@ -2,6 +2,9 @@ # replicated LOAD DATA INFILE correctly when it has binlog_*_db rules. # This is for BUG#1100 (LOAD DATA INFILE was half-logged). +# Requires statement logging +-- source include/have_binlog_format_statement.inc + source include/master-slave.inc; connection slave; reset master; --- 1.12/mysql-test/t/rpl_max_relay_size.test 2004-05-26 16:10:51 +02:00 +++ 1.13/mysql-test/t/rpl_max_relay_size.test 2005-04-29 02:45:17 +02:00 @@ -3,6 +3,9 @@ # for relay logs too). # Test of manual relay log rotation with FLUSH LOGS. +# Requires statement logging +-- source include/have_binlog_format_statement.inc + source include/master-slave.inc; connection slave; stop slave; --- 1.7/mysql-test/t/rpl_multi_query.test 2005-04-01 13:32:26 +02:00 +++ 1.8/mysql-test/t/rpl_multi_query.test 2005-04-29 02:45:17 +02:00 @@ -3,6 +3,9 @@ # CLIENT_MULTI_STATEMENTS) will be binlogged ONE-query-per-event (not # one binlog event containing all queries) +# Requires statement logging +-- source include/have_binlog_format_statement.inc + # PS doesn't support multi-statements --disable_ps_protocol --- 1.4/mysql-test/t/ctype_ucs_binlog.test 2005-04-14 09:56:17 +02:00 +++ 1.5/mysql-test/t/ctype_ucs_binlog.test 2005-04-29 02:45:16 +02:00 @@ -1,3 +1,6 @@ +# Requires statement logging +-- source include/have_binlog_format_statement.inc + --source include/not_embedded.inc --source include/have_ucs2.inc --- 1.2/mysql-test/t/insert_select-binlog.test 2005-04-18 11:54:56 +02:00 +++ 1.3/mysql-test/t/insert_select-binlog.test 2005-04-29 02:45:16 +02:00 @@ -1,3 +1,4 @@ +# Requires statement logging -- source include/have_binlog_format_statement.inc # Embedded server doesn't support binlog --- 1.2/mysql-test/t/user_var-binlog.test 2005-04-05 01:34:21 +02:00 +++ 1.3/mysql-test/t/user_var-binlog.test 2005-04-29 02:45:17 +02:00 @@ -1,3 +1,6 @@ +# Requires statement logging +-- source include/have_binlog_format_statement.inc + # Embedded server does not support binlogging --source include/not_embedded.inc --- 1.30/storage/ndb/tools/restore/restore_main.cpp 2005-04-08 02:44:36 +02:00 +++ 1.31/storage/ndb/tools/restore/restore_main.cpp 2005-04-29 02:45:17 +02:00 @@ -218,7 +218,8 @@ (strcmp(tableName, "SYSTAB_0") != 0 && strcmp(tableName, "NDB$EVENTS_0") != 0 && strcmp(tableName, "sys/def/SYSTAB_0") != 0 && - strcmp(tableName, "sys/def/NDB$EVENTS_0") != 0); + strcmp(tableName, "sys/def/NDB$EVENTS_0") != 0 && + strcmp(tableName, "cluster_replication/def/apply_status") != 0); } static void --- 1.227/sql/ha_ndbcluster.cc 2005-04-27 00:51:15 +02:00 +++ 1.228/sql/ha_ndbcluster.cc 2005-04-29 02:45:17 +02:00 @@ -8041,7 +8041,7 @@ "CREATE TABLE IF NOT EXISTS "), NDB_REP_DB),"."),NDB_APPLY_TABLE), " ( server_id INT UNSIGNED NOT NULL, epoch BIGINT UNSIGNED NOT NULL, " - " PRIMARY KEY(server_id) ) ENGINE=NDB"); + " PRIMARY KEY USING HASH (server_id) ) ENGINE=NDB"); ulong save_query_length= thd->query_length; char *save_query= thd->query; --- 1.8/mysql-test/r/rpl_row_basic_myisam.result 2005-04-20 13:36:58 +02:00 +++ 1.9/mysql-test/r/rpl_row_basic_myisam.result 2005-04-29 02:45:16 +02:00 @@ -7,7 +7,7 @@ CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)) engine=myisam; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.0-alpha-debug-log, Binlog ver: 4 +master-bin.000001 4 Format_desc 1 102 Server ver: VERSION, Binlog ver: 4 master-bin.000001 102 Query 1 232 use `test`; CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)) engine=myisam SELECT * FROM t1; C1 C2 @@ -67,7 +67,7 @@ X Z SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 102 Server ver: 5.1.0-alpha-debug-log, Binlog ver: 4 +master-bin.000001 4 Format_desc 1 102 Server ver: VERSION, Binlog ver: 4 master-bin.000001 102 Query 1 232 use `test`; CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)) engine=myisam master-bin.000001 232 Table_map 1 270 master-bin.000001 270 Write_rows 1 312 --- 1.2/mysql-test/r/rpl_row_basic_innodb.result 2005-04-20 13:27:11 +02:00 +++ 1.3/mysql-test/r/rpl_row_basic_innodb.result 2005-04-29 02:45:16 +02:00 @@ -7,7 +7,7 @@ CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)) engine=innodb; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -<binlog> 4 Format_desc 1 <end_log_pos> Server ver: 5.1.0-alpha-debug-log, Binlog ver: 4 +<binlog> 4 Format_desc 1 <end_log_pos> Server ver: VERSION, Binlog ver: 4 <binlog> 102 Query 1 <end_log_pos> use `test`; CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)) engine=innodb SELECT * FROM t1; C1 C2 --- 1.2/mysql-test/r/rpl_row_trans.result 2005-04-01 13:25:12 +02:00 +++ 1.3/mysql-test/r/rpl_row_trans.result 2005-04-29 02:45:16 +02:00 @@ -46,7 +46,7 @@ a b SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -<binlog> <pos> Format_desc <server_id> <end_pos> Server ver: 5.1.0-alpha-debug-log, Binlog ver: 4 +<binlog> <pos> Format_desc <server_id> <end_pos> Server ver: VERSION, Binlog ver: 4 <binlog> <pos> Query <server_id> <end_pos> use `test`; CREATE TABLE t4 (a CHAR(1), b CHAR(1)) engine=myisam <binlog> <pos> Query <server_id> <end_pos> use `test`; CREATE TABLE t5 (a CHAR(1), b CHAR(1)) engine=innodb <binlog> <pos> Table_map <server_id> <end_pos> --- 1.3/mysql-test/t/rpl_create_database.test 2004-12-06 16:15:48 +01:00 +++ 1.4/mysql-test/t/rpl_create_database.test 2005-04-29 02:45:17 +02:00 @@ -6,6 +6,9 @@ # (e.g., american) will not be replicated. # +# Requires statement logging +-- source include/have_binlog_format_statement.inc + source include/master-slave.inc; # Bug#6391 (binlog-do-db rules ignored) --- 1.8/mysql-test/t/rpl_row_basic_myisam.test 2005-04-20 13:32:15 +02:00 +++ 1.9/mysql-test/t/rpl_row_basic_myisam.test 2005-04-29 02:45:17 +02:00 @@ -1,3 +1,4 @@ +--source include/have_binlog_format_row.inc source include/master-slave.inc # @@ -5,6 +6,7 @@ # CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)) engine=myisam; +--replace_result $VERSION VERSION SHOW BINLOG EVENTS; SELECT * FROM t1; sync_slave_with_master; @@ -14,7 +16,8 @@ connection master; INSERT INTO t1 VALUES ('A','B'), ('X','Y'), ('X','X'); INSERT INTO t1 VALUES ('A','C'), ('X', 'Z'), ('A', 'A'); -SHOW BINLOG EVENTS FROM 232; +--replace_result $VERSION VERSION +SHOW BINLOG EVENTS; SELECT * FROM t1; sync_slave_with_master; SELECT * FROM t1; @@ -24,7 +27,8 @@ # should be deleted. connection master; DELETE FROM t1 WHERE C1 = C2; -SHOW BINLOG EVENTS FROM 392; +--replace_result $VERSION VERSION +SHOW BINLOG EVENTS; SELECT * FROM t1; sync_slave_with_master; SELECT * FROM t1; @@ -36,8 +40,10 @@ # connection master; UPDATE t1 SET C2 = 'I' WHERE C1 = 'A' AND C2 = 'C'; -SHOW BINLOG EVENTS FROM 467; +--replace_result $VERSION VERSION +SHOW BINLOG EVENTS; SELECT * FROM t1; +--replace_result $VERSION VERSION SHOW BINLOG EVENTS; sync_slave_with_master; SELECT * FROM t1; --- 1.2/mysql-test/t/rpl_row_basic_innodb.test 2005-04-20 13:27:11 +02:00 +++ 1.3/mysql-test/t/rpl_row_basic_innodb.test 2005-04-29 02:45:17 +02:00 @@ -1,3 +1,4 @@ +--source include/have_binlog_format_row.inc source include/master-slave.inc # @@ -5,6 +6,7 @@ # CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)) engine=innodb; +--replace_result $VERSION VERSION --replace_column 1 <binlog> 5 <end_log_pos> SHOW BINLOG EVENTS; SELECT * FROM t1; @@ -15,6 +17,7 @@ connection master; INSERT INTO t1 VALUES ('A','B'), ('X','Y'), ('X','X'); INSERT INTO t1 VALUES ('A','C'), ('X', 'Z'), ('A', 'A'); +--replace_result $VERSION VERSION --replace_column 1 <binlog> 5 <end_log_pos> SHOW BINLOG EVENTS FROM 232; SELECT * FROM t1; @@ -26,6 +29,7 @@ # should be deleted. connection master; DELETE FROM t1 WHERE C1 = C2; +--replace_result $VERSION VERSION --replace_column 1 <binlog> 5 <end_log_pos> SHOW BINLOG EVENTS FROM 446; SELECT * FROM t1; @@ -39,6 +43,7 @@ # connection master; UPDATE t1 SET C2 = 'I' WHERE C1 = 'A' AND C2 = 'C'; +--replace_result $VERSION VERSION --replace_column 1 <binlog> 2 <pos> 5 <end_log_pos> SHOW BINLOG EVENTS FROM 548; SELECT * FROM t1; --- 1.2/mysql-test/t/rpl_row_trans.test 2005-03-21 19:24:55 +01:00 +++ 1.3/mysql-test/t/rpl_row_trans.test 2005-04-29 02:45:17 +02:00 @@ -1,3 +1,4 @@ +--source include/have_binlog_format_row.inc source include/master-slave.inc # @@ -17,6 +18,7 @@ SELECT * FROM t4; SELECT * FROM t5; +--replace_result $VERSION VERSION --replace_column 1 <binlog> 4 <server-id> 5 <End-pos> SHOW BINLOG EVENTS FROM 1354; sync_slave_with_master; @@ -33,6 +35,7 @@ SELECT * FROM t4; SELECT * FROM t5; +--replace_result $VERSION VERSION --replace_column 1 <binlog> 2 <pos> 4 <server_id> 5 <end_pos> SHOW BINLOG EVENTS; sync_slave_with_master; --- 1.16/mysql-test/t/rpl_loaddata.test 2005-03-25 14:51:04 +01:00 +++ 1.17/mysql-test/t/rpl_loaddata.test 2005-04-29 02:45:17 +02:00 @@ -11,6 +11,9 @@ # check if START SLAVE, RESET SLAVE, CHANGE MASTER reset Last_slave_error and # Last_slave_errno in SHOW SLAVE STATUS (1st and 3rd commands did not: bug 986) +# Requires statement logging +-- source include/have_binlog_format_statement.inc + source include/master-slave.inc; connection slave; --- 1.35/mysql-test/t/rpl_log_pos.test 2005-04-01 13:32:26 +02:00 +++ 1.36/mysql-test/t/rpl_log_pos.test 2005-04-29 02:45:17 +02:00 @@ -1,6 +1,10 @@ # # Testing of setting slave to wrong log position with master_log_pos # + +# Requires statement logging +-- source include/have_binlog_format_statement.inc + source include/master-slave.inc; show master status; sync_slave_with_master; --- 1.30/mysql-test/t/rpl000015.test 2004-11-22 20:54:42 +01:00 +++ 1.31/mysql-test/t/rpl000015.test 2005-04-29 02:45:16 +02:00 @@ -1,3 +1,6 @@ +# Requires statement logging +-- source include/have_binlog_format_statement.inc + connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK); connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock); connection master; --- 1.60/mysql-test/t/rpl_rotate_logs.test 2005-02-25 16:03:22 +01:00 +++ 1.61/mysql-test/t/rpl_rotate_logs.test 2005-04-29 02:45:17 +02:00 @@ -9,6 +9,9 @@ # changes # - Test creating a duplicate key error and recover from it +# Requires statement logging +-- source include/have_binlog_format_statement.inc + connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK); --disable_warnings drop table if exists t1, t2, t3, t4; --- 1.27/mysql-test/t/rpl_log.test 2005-04-01 13:32:26 +02:00 +++ 1.28/mysql-test/t/rpl_log.test 2005-04-29 02:45:17 +02:00 @@ -1,3 +1,6 @@ +# Requires statement logging +-- source include/have_binlog_format_statement.inc + source include/master-slave.inc; # Clean up old slave's binlogs. --- 1.27/mysql-test/t/user_var.test 2005-04-14 14:42:58 +02:00 +++ 1.28/mysql-test/t/user_var.test 2005-04-29 02:45:17 +02:00 @@ -1,3 +1,6 @@ +# Requires statement logging +-- source include/have_binlog_format_statement.inc + # Initialise --disable_warnings drop table if exists t1,t2; --- 1.2/mysql-test/include/rpl_row_basic.inc 2005-04-27 00:22:00 +02:00 +++ 1.3/mysql-test/include/rpl_row_basic.inc 2005-04-29 02:45:16 +02:00 @@ -1,11 +1,15 @@ --source include/have_binlog_format_row.inc --source include/master-slave.inc +# prepare version for substitutions +let $VERSION=`select version()`; + # # Basic tests of row-level logging # eval CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), C3 INT, PRIMARY KEY (C3)) ENGINE = $type ; +--replace_result $VERSION VERSION --replace_column 1 <binlog> 2 <pos> 5 <end_log_pos> SHOW BINLOG EVENTS; SELECT * FROM t1; @@ -16,6 +20,7 @@ connection master; INSERT INTO t1 VALUES ('A','B',1), ('X','Y',2), ('X','X',3); INSERT INTO t1 VALUES ('A','C',4), ('X', 'Z',5), ('A', 'A',6); +--replace_result $VERSION VERSION --replace_column 1 <binlog> 2 <pos> 5 <end_log_pos> SHOW BINLOG EVENTS; SELECT * FROM t1 ORDER BY C1,C2; @@ -27,6 +32,7 @@ # should be deleted. connection master; DELETE FROM t1 WHERE C1 = C2; +--replace_result $VERSION VERSION --replace_column 1 <binlog> 2 <pos> 5 <end_log_pos> SHOW BINLOG EVENTS; SELECT * FROM t1 ORDER BY C1,C2; @@ -40,6 +46,7 @@ # connection master; UPDATE t1 SET C2 = 'I' WHERE C1 = 'A' AND C2 = 'C'; +--replace_result $VERSION VERSION --replace_column 1 <binlog> 2 <pos> 5 <end_log_pos> SHOW BINLOG EVENTS; SELECT * FROM t1 ORDER BY C1,C2; --- 1.5/mysql-test/r/ndb_rpl_multi.result 2005-04-22 17:26:52 +02:00 +++ 1.6/mysql-test/r/ndb_rpl_multi.result 2005-04-29 02:45:16 +02:00 @@ -1,32 +1,43 @@ -drop table if exists t2; -drop table if exists t2; -show tables; +drop table if exists t1,t2; +drop table if exists t1,t2; +SHOW TABLES; Tables_in_test -create table t2 (a int primary key, b int) engine=ndb; +CREATE TABLE t2 (a INT PRIMARY KEY, b int) ENGINE = NDB; show tables; Tables_in_test t2 -insert into t2 values (1,1),(2,2); +INSERT INTO t2 VALUES (1,1),(2,2); select * from t2 order by a; a b 1 1 2 2 -select * from cluster_replication.binlog_index order by epoch desc limit 1; -Position File epoch inserts updates deletes schemaops -# # # 2 0 0 0 -select * from t2 order by a; +SELECT @the_epoch:=epoch,inserts,updates,deletes,schemaops FROM +cluster_replication.binlog_index ORDER BY epoch DESC LIMIT 1; +@the_epoch:=epoch inserts updates deletes schemaops +<the_epoch> 2 0 0 0 +SELECT * FROM t2 ORDER BY a; a b 1 1 2 2 -select * from cluster_replication.binlog_index order by epoch desc limit 1; -Position File epoch inserts updates deletes schemaops -# # # 2 0 0 0 -drop table t2; -select * from cluster_replication.binlog_index order by epoch desc limit 1; -Position File epoch inserts updates deletes schemaops -# # # 0 0 0 1 -show tables; +SELECT inserts,updates,deletes,schemaops FROM +cluster_replication.binlog_index WHERE epoch=<the_epoch>; +inserts updates deletes schemaops +2 0 0 0 +DROP TABLE t2; +CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE = NDB; +INSERT INTO t1 VALUES (1),(2); +SELECT @the_epoch2:=epoch,inserts,updates,deletes,schemaops FROM +cluster_replication.binlog_index ORDER BY epoch DESC LIMIT 1; +@the_epoch2:=epoch inserts updates deletes schemaops +<the_epoch2> 2 0 0 0 +SELECT inserts,updates,deletes,schemaops FROM +cluster_replication.binlog_index WHERE epoch > <the_epoch> AND epoch < <the_epoch2>; +inserts updates deletes schemaops +0 0 0 1 +drop table t1; +SHOW TABLES; Tables_in_test -select * from cluster_replication.binlog_index order by epoch desc limit 1; -Position File epoch inserts updates deletes schemaops -# # # 0 0 0 1 +SELECT inserts,updates,deletes,schemaops FROM +cluster_replication.binlog_index WHERE epoch > <the_epoch> AND epoch < <the_epoch2>; +inserts updates deletes schemaops +0 0 0 1 --- 1.1/mysql-test/r/rpl_row_basic_2myisam.result 2005-04-18 03:45:24 +02:00 +++ 1.2/mysql-test/r/rpl_row_basic_2myisam.result 2005-04-29 02:45:16 +02:00 @@ -7,7 +7,7 @@ CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)) ENGINE = 'MYISAM' ; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: 5.1.0-alpha-debug-log, Binlog ver: 4 +<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: VERSION, Binlog ver: 4 <binlog> <pos> Query 1 <end_log_pos> use `test`; CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)) ENGINE = 'MYISAM' SELECT * FROM t1; C1 C2 @@ -17,7 +17,7 @@ INSERT INTO t1 VALUES ('A','C'), ('X', 'Z'), ('A', 'A'); SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: 5.1.0-alpha-debug-log, Binlog ver: 4 +<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: VERSION, Binlog ver: 4 <binlog> <pos> Query 1 <end_log_pos> use `test`; CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)) ENGINE = 'MYISAM' <binlog> <pos> Table_map 1 <end_log_pos> <binlog> <pos> Write_rows 1 <end_log_pos> @@ -42,7 +42,7 @@ DELETE FROM t1 WHERE C1 = C2; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: 5.1.0-alpha-debug-log, Binlog ver: 4 +<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: VERSION, Binlog ver: 4 <binlog> <pos> Query 1 <end_log_pos> use `test`; CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)) ENGINE = 'MYISAM' <binlog> <pos> Table_map 1 <end_log_pos> <binlog> <pos> Write_rows 1 <end_log_pos> @@ -65,7 +65,7 @@ UPDATE t1 SET C2 = 'I' WHERE C1 = 'A' AND C2 = 'C'; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: 5.1.0-alpha-debug-log, Binlog ver: 4 +<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: VERSION, Binlog ver: 4 <binlog> <pos> Query 1 <end_log_pos> use `test`; CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)) ENGINE = 'MYISAM' <binlog> <pos> Table_map 1 <end_log_pos> <binlog> <pos> Write_rows 1 <end_log_pos> --- 1.3/mysql-test/r/rpl_row_basic_3innodb.result 2005-04-27 00:22:00 +02:00 +++ 1.4/mysql-test/r/rpl_row_basic_3innodb.result 2005-04-29 02:45:16 +02:00 @@ -7,7 +7,7 @@ CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), C3 INT, PRIMARY KEY (C3)) ENGINE = 'INNODB' ; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: 5.1.0-alpha-debug-log, Binlog ver: 4 +<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: VERSION, Binlog ver: 4 <binlog> <pos> Query 1 <end_log_pos> use `test`; CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), C3 INT, PRIMARY KEY (C3)) ENGINE = 'INNODB' SELECT * FROM t1; C1 C2 C3 @@ -17,7 +17,7 @@ INSERT INTO t1 VALUES ('A','C',4), ('X', 'Z',5), ('A', 'A',6); SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: 5.1.0-alpha-debug-log, Binlog ver: 4 +<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: VERSION, Binlog ver: 4 <binlog> <pos> Query 1 <end_log_pos> use `test`; CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), C3 INT, PRIMARY KEY (C3)) ENGINE = 'INNODB' <binlog> <pos> Table_map 1 <end_log_pos> <binlog> <pos> Write_rows 1 <end_log_pos> @@ -44,7 +44,7 @@ DELETE FROM t1 WHERE C1 = C2; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: 5.1.0-alpha-debug-log, Binlog ver: 4 +<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: VERSION, Binlog ver: 4 <binlog> <pos> Query 1 <end_log_pos> use `test`; CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), C3 INT, PRIMARY KEY (C3)) ENGINE = 'INNODB' <binlog> <pos> Table_map 1 <end_log_pos> <binlog> <pos> Write_rows 1 <end_log_pos> @@ -70,7 +70,7 @@ UPDATE t1 SET C2 = 'I' WHERE C1 = 'A' AND C2 = 'C'; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: 5.1.0-alpha-debug-log, Binlog ver: 4 +<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: VERSION, Binlog ver: 4 <binlog> <pos> Query 1 <end_log_pos> use `test`; CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), C3 INT, PRIMARY KEY (C3)) ENGINE = 'INNODB' <binlog> <pos> Table_map 1 <end_log_pos> <binlog> <pos> Write_rows 1 <end_log_pos> --- 1.5/mysql-test/r/rpl_row_basic_7ndb.result 2005-04-27 00:49:30 +02:00 +++ 1.6/mysql-test/r/rpl_row_basic_7ndb.result 2005-04-29 02:45:16 +02:00 @@ -7,7 +7,7 @@ CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), C3 INT, PRIMARY KEY (C3)) ENGINE = 'NDB' ; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: 5.1.0-alpha-debug-log, Binlog ver: 4 +<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: VERSION, Binlog ver: 4 <binlog> <pos> Query 1 <end_log_pos> use `test`; CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), C3 INT, PRIMARY KEY (C3)) ENGINE = 'NDB' SELECT * FROM t1; C1 C2 C3 @@ -17,7 +17,7 @@ INSERT INTO t1 VALUES ('A','C',4), ('X', 'Z',5), ('A', 'A',6); SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: 5.1.0-alpha-debug-log, Binlog ver: 4 +<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: VERSION, Binlog ver: 4 <binlog> <pos> Query 1 <end_log_pos> use `test`; CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), C3 INT, PRIMARY KEY (C3)) ENGINE = 'NDB' <binlog> <pos> Query 1 <end_log_pos> BEGIN <binlog> <pos> Table_map 1 <end_log_pos> @@ -44,7 +44,7 @@ DELETE FROM t1 WHERE C1 = C2; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: 5.1.0-alpha-debug-log, Binlog ver: 4 +<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: VERSION, Binlog ver: 4 <binlog> <pos> Query 1 <end_log_pos> use `test`; CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), C3 INT, PRIMARY KEY (C3)) ENGINE = 'NDB' <binlog> <pos> Query 1 <end_log_pos> BEGIN <binlog> <pos> Table_map 1 <end_log_pos> @@ -73,7 +73,7 @@ UPDATE t1 SET C2 = 'I' WHERE C1 = 'A' AND C2 = 'C'; SHOW BINLOG EVENTS; Log_name Pos Event_type Server_id End_log_pos Info -<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: 5.1.0-alpha-debug-log, Binlog ver: 4 +<binlog> <pos> Format_desc 1 <end_log_pos> Server ver: VERSION, Binlog ver: 4 <binlog> <pos> Query 1 <end_log_pos> use `test`; CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), C3 INT, PRIMARY KEY (C3)) ENGINE = 'NDB' <binlog> <pos> Query 1 <end_log_pos> BEGIN <binlog> <pos> Table_map 1 <end_log_pos> --- 1.8/mysql-test/t/ndb_rpl_multi.test 2005-04-21 01:00:13 +02:00 +++ 1.9/mysql-test/t/ndb_rpl_multi.test 2005-04-29 02:45:16 +02:00 @@ -4,9 +4,9 @@ --disable_warnings connection server2; -drop table if exists t2; +drop table if exists t1,t2; connection server1; -drop table if exists t2; +drop table if exists t1,t2; --enable_warnings # @@ -16,11 +16,11 @@ # no tables and nothing in cluster_replication.binlog_index; connection server1; -show tables; +SHOW TABLES; # create table on the other server connection server2; -create table t2 (a int primary key, b int) engine=ndb; +CREATE TABLE t2 (a INT PRIMARY KEY, b int) ENGINE = NDB; # make sure the first mysql server knows about this table connection server1; @@ -28,28 +28,43 @@ # insert something on server2 connection server2; -insert into t2 values (1,1),(2,2); +INSERT INTO t2 VALUES (1,1),(2,2); select * from t2 order by a; save_master_pos; ---replace_column 1 # 2 # 3 # -select * from cluster_replication.binlog_index order by epoch desc limit 1; +--replace_column 1 <the_epoch> +SELECT @the_epoch:=epoch,inserts,updates,deletes,schemaops FROM + cluster_replication.binlog_index ORDER BY epoch DESC LIMIT 1; +let $the_epoch= `SELECT @the_epoch`; # see if we got something on server1 connection server1; -select * from t2 order by a; ---replace_column 1 # 2 # 3 # -select * from cluster_replication.binlog_index order by epoch desc limit 1; +SELECT * FROM t2 ORDER BY a; +--replace_result $the_epoch <the_epoch> +eval SELECT inserts,updates,deletes,schemaops FROM + cluster_replication.binlog_index WHERE epoch=$the_epoch; # drop the table on server1 -drop table t2; ---replace_column 1 # 2 # 3 # -select * from cluster_replication.binlog_index order by epoch desc limit 1; +DROP TABLE t2; +CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE = NDB; +INSERT INTO t1 VALUES (1),(2); +save_master_pos; +--replace_column 1 <the_epoch2> +SELECT @the_epoch2:=epoch,inserts,updates,deletes,schemaops FROM + cluster_replication.binlog_index ORDER BY epoch DESC LIMIT 1; +let $the_epoch2= `SELECT @the_epoch2`; + +--replace_result $the_epoch <the_epoch> $the_epoch2 <the_epoch2> +eval SELECT inserts,updates,deletes,schemaops FROM + cluster_replication.binlog_index WHERE epoch > $the_epoch AND epoch < $the_epoch2; +drop table t1; # flush on server2 connection server2; -show tables; ---replace_column 1 # 2 # 3 # -select * from cluster_replication.binlog_index order by epoch desc limit 1; +SHOW TABLES; +--replace_result $the_epoch <the_epoch> $the_epoch2 <the_epoch2> +eval SELECT inserts,updates,deletes,schemaops FROM + cluster_replication.binlog_index WHERE epoch > $the_epoch AND epoch < $the_epoch2; # reset connection server1; + --- 1.14/mysql-test/t/rpl_temporary.test 2005-03-16 02:32:41 +01:00 +++ 1.15/mysql-test/t/rpl_temporary.test 2005-04-29 02:45:17 +02:00 @@ -1,3 +1,6 @@ +# Requires statement logging +-- source include/have_binlog_format_statement.inc + source include/master-slave.inc; # Clean up old slave's binlogs.
| Thread | ||
|---|---|---|
| • bk commit into 5.1 tree (tomas:1.1828) | tomas | 29 Apr |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.995 sec. using MySQL 5.1.14-beta-log