From 5618a20e1026cece0cf183e4b21edbaeb3891390 Mon Sep 17 00:00:00 2001 From: Mattias Jonsson Date: Fri, 3 Dec 2010 14:05:33 +0100 Subject: [PATCH] post-push fix for test to work on row-based-replication --- mysql-test/r/partition_binlog.result | 7 ------- mysql-test/t/partition_binlog.test | 6 +++--- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/mysql-test/r/partition_binlog.result b/mysql-test/r/partition_binlog.result index 8b449371d0e..c8fa02c4b99 100644 --- a/mysql-test/r/partition_binlog.result +++ b/mysql-test/r/partition_binlog.result @@ -41,13 +41,6 @@ ALTER TABLE t1 TRUNCATE PARTITION p0; ALTER TABLE t1 DROP PARTITION p0; show binlog events in 'master-bin.000001' from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Query # # use `test`; CREATE TABLE t1(id INT) -PARTITION BY RANGE (id) -(PARTITION p0 VALUES LESS THAN (100), -PARTITION pmax VALUES LESS THAN (MAXVALUE)) -master-bin.000001 # Query # # BEGIN -master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1), (10), (100), (1000) -master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # use `test`; ALTER TABLE t1 ANALYZE PARTITION p0 master-bin.000001 # Query # # use `test`; ALTER TABLE t1 OPTIMIZE PARTITION p0 master-bin.000001 # Query # # use `test`; ALTER TABLE t1 REPAIR PARTITION p0 diff --git a/mysql-test/t/partition_binlog.test b/mysql-test/t/partition_binlog.test index 432cdc922d6..c1f618b794f 100644 --- a/mysql-test/t/partition_binlog.test +++ b/mysql-test/t/partition_binlog.test @@ -9,9 +9,6 @@ DROP TABLE IF EXISTS t1; --echo # but the statement is written to binlog --echo # ---let $binlog_file=query_get_value(SHOW MASTER STATUS, File, 1) ---let $binlog_start=query_get_value(SHOW MASTER STATUS, Position, 1) - CREATE TABLE t1(id INT) PARTITION BY RANGE (id) (PARTITION p0 VALUES LESS THAN (100), @@ -19,6 +16,9 @@ PARTITION BY RANGE (id) INSERT INTO t1 VALUES (1), (10), (100), (1000); +--let $binlog_file=query_get_value(SHOW MASTER STATUS, File, 1) +--let $binlog_start=query_get_value(SHOW MASTER STATUS, Position, 1) + --error ER_WRONG_PARTITION_NAME ALTER TABLE t1 TRUNCATE PARTITION p1; --error ER_DROP_PARTITION_NON_EXISTENT