diff options
| author | unknown <mats@mysql.com> | 2006-02-16 08:46:45 +0100 |
|---|---|---|
| committer | unknown <mats@mysql.com> | 2006-02-16 08:46:45 +0100 |
| commit | 738a1ca08db810aa37069da149aa21590292caac (patch) | |
| tree | 3f960f1eee8ec7454fbf52e22f645085d4b004dd /mysql-test/t | |
| parent | 13adc06f53122cf890b8d58d21bc77a51132c80f (diff) | |
| parent | 41f7d138539c01afbcb6efb2f772fae0e9c3cd05 (diff) | |
| download | mariadb-git-738a1ca08db810aa37069da149aa21590292caac.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-5.1-new
into mysql.com:/home/bk/w3023-mysql-5.1-new
mysql-test/extra/binlog_tests/ctype_cp932.test:
Auto merged
mysql-test/r/binlog_row_blackhole.result:
Auto merged
mysql-test/r/binlog_stm_ctype_cp932.result:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/lock.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log.h:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/parse_file.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.h:
Auto merged
sql/log_event.cc:
Merge with mysql-5.1-new
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/rpl_row_create_table.test | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/t/rpl_row_create_table.test b/mysql-test/t/rpl_row_create_table.test index faabf489bba..52373b8278c 100644 --- a/mysql-test/t/rpl_row_create_table.test +++ b/mysql-test/t/rpl_row_create_table.test @@ -60,7 +60,7 @@ connection master; --error 1062 CREATE TABLE t7 (UNIQUE(b)) SELECT a,b FROM tt3; # Shouldn't be written to the binary log -SHOW BINLOG EVENTS FROM 1256; +SHOW BINLOG EVENTS FROM 1326; # Test that INSERT-SELECT works the same way as for SBR. CREATE TABLE t7 (a INT, b INT UNIQUE); @@ -68,7 +68,7 @@ CREATE TABLE t7 (a INT, b INT UNIQUE); INSERT INTO t7 SELECT a,b FROM tt3; SELECT * FROM t7 ORDER BY a,b; # Should be written to the binary log -SHOW BINLOG EVENTS FROM 1256; +SHOW BINLOG EVENTS FROM 1326; sync_slave_with_master; SELECT * FROM t7 ORDER BY a,b; @@ -78,7 +78,7 @@ INSERT INTO tt4 VALUES (4,8), (5,10), (6,12); BEGIN; INSERT INTO t7 SELECT a,b FROM tt4; ROLLBACK; -SHOW BINLOG EVENTS FROM 1452; +SHOW BINLOG EVENTS FROM 1522; SELECT * FROM t7 ORDER BY a,b; sync_slave_with_master; SELECT * FROM t7 ORDER BY a,b; @@ -91,7 +91,7 @@ CREATE TEMPORARY TABLE tt6 LIKE tt4; --echo **** On Master **** --query_vertical SHOW CREATE TABLE t8 --query_vertical SHOW CREATE TABLE t9 -SHOW BINLOG EVENTS FROM 1548; +SHOW BINLOG EVENTS FROM 1618; sync_slave_with_master; --echo **** On Slave **** --query_vertical SHOW CREATE TABLE t8 |