diff options
| author | unknown <lars@dl145k.mysql.com> | 2006-06-16 02:44:23 +0200 |
|---|---|---|
| committer | unknown <lars@dl145k.mysql.com> | 2006-06-16 02:44:23 +0200 |
| commit | cc542b2f984fa9f1e33979823916c9e9d987a7d7 (patch) | |
| tree | f943b35f6a411126cd268198c66a8c1cf2d79bee | |
| parent | 9933c3bd3a21f8b7dfbe80068ae455be325d8d3f (diff) | |
| parent | 6e2bb263afa5a2348838df3e771c63715ab4e177 (diff) | |
| download | mariadb-git-cc542b2f984fa9f1e33979823916c9e9d987a7d7.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
mysql-test/t/disabled.def:
Auto merged
| -rw-r--r-- | mysql-test/r/rpl_row_basic_11bugs.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/disabled.def | 1 | ||||
| -rw-r--r-- | mysql-test/t/rpl_row_basic_11bugs.test | 3 | ||||
| -rw-r--r-- | mysql-test/t/rpl_truncate_7ndb.test | 2 |
4 files changed, 7 insertions, 1 deletions
diff --git a/mysql-test/r/rpl_row_basic_11bugs.result b/mysql-test/r/rpl_row_basic_11bugs.result index 8c8a77b5084..e8be537816e 100644 --- a/mysql-test/r/rpl_row_basic_11bugs.result +++ b/mysql-test/r/rpl_row_basic_11bugs.result @@ -56,7 +56,7 @@ DELETE FROM t1 WHERE a = 0; UPDATE t1 SET a=99 WHERE a = 0; 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.11-beta-debug-log, Binlog ver: 4 +master-bin.000001 4 Format_desc 1 102 Server ver: SERVER_VERSION, Binlog ver: 4 master-bin.000001 102 Query 1 188 use `test`; CREATE TABLE t1 (a INT) master-bin.000001 188 Table_map 1 227 table_id: # (test.t1) master-bin.000001 227 Write_rows 1 266 table_id: # flags: STMT_END_F diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index a815d538e57..2305004a5a3 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -37,6 +37,7 @@ rpl_switch_stm_row_mixed : BUG#18590 2006-03-28 brian rpl_row_blob_innodb : BUG#18980 2006-04-10 kent Test fails randomly rpl_row_func003 : BUG#19074 2006-13-04 andrei test failed rpl_sp : BUG#16456 2006-02-16 jmiller +rpl_sp_effects : BUG#19862 2006-06-15 mkindahl # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open #ndb_binlog_ddl_multi : BUG#18976 2006-04-10 kent CRBR: multiple binlog, second binlog may miss schema log events diff --git a/mysql-test/t/rpl_row_basic_11bugs.test b/mysql-test/t/rpl_row_basic_11bugs.test index bd582ce349a..af7e9af4005 100644 --- a/mysql-test/t/rpl_row_basic_11bugs.test +++ b/mysql-test/t/rpl_row_basic_11bugs.test @@ -2,6 +2,8 @@ --source include/have_binlog_format_row.inc +let $SERVER_VERSION=`select version()`; + #This test case is not written for NDB, the result files #will not match when NDB is the default engine -- source include/not_ndb_default.inc @@ -49,5 +51,6 @@ DELETE FROM t1; INSERT INTO t1 VALUES (1),(2); DELETE FROM t1 WHERE a = 0; UPDATE t1 SET a=99 WHERE a = 0; +--replace_result $SERVER_VERSION SERVER_VERSION --replace_regex /table_id: [0-9]+/table_id: #/ SHOW BINLOG EVENTS; diff --git a/mysql-test/t/rpl_truncate_7ndb.test b/mysql-test/t/rpl_truncate_7ndb.test index 7a6151c6028..77ea303a17f 100644 --- a/mysql-test/t/rpl_truncate_7ndb.test +++ b/mysql-test/t/rpl_truncate_7ndb.test @@ -22,6 +22,8 @@ CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB; INSERT INTO t1 VALUES (1,1), (2,2); SELECT * FROM t1 ORDER BY a,b; --echo **** On Slave **** +# This is silly, but NDB doesn't add to the binlog fast enough +--real_sleep 10 sync_slave_with_master; INSERT INTO t1 VALUE (3,3); SELECT * FROM t1 ORDER BY a,b; |