3470 Andrei Elkin 2011-10-03
fixing bug@11747416 post-push few tests non-deterministic tests/results. Few print-outs are removed until a new Bug@13055685 has provided a necessary too.
modified:
mysql-test/suite/rpl/r/rpl_manual_change_index_file.result
mysql-test/suite/rpl/r/rpl_packet.result
mysql-test/suite/rpl/r/rpl_row_event_max_size.result
mysql-test/suite/rpl/t/rpl_manual_change_index_file.test
mysql-test/suite/rpl/t/rpl_packet.test
mysql-test/suite/rpl/t/rpl_row_event_max_size.test
3469 Rohit Kalhans 2011-10-03
BUG#11747866:REPLICATE-REWRITE-DB DOESN'T WORK WITH SINGLE CHARACTER DATABASE NAMES
Problem: replicate-rewrite-db option doesnot work with single character database names.
The last character was being trimmed from the "from" database name.
Background: Since the loop handling the option, has to handle invalid arguments for the
option,while stripping the whitespaces, it was stripping one character from the "from"
database name. In case where there was only one character, this threw an error as
"empty from database name".
Fix. Revamped the loop handling this option. Made sure that the whitespaces are
suitably trimmed and the correct "to" and "from" databases names are passed to the
function handling the replicate_rewrite_db functionality.
@ mysql-test/suite/rpl/r/rpl_replicate_rewrite_db.result
Added: New test-result file.
@ mysql-test/suite/rpl/t/rpl_replicate_rewrite_db.test
Added: New test file.
@ sql/mysqld.cc
Revamped the loop handling this option. Made sure that the whitespaces are
suitably trimmed and the correct "to" and "from" databases names are passed
to the function handling the replicate_rewrite_db functionality.
added:
mysql-test/suite/rpl/r/rpl_replicate_rewrite_db.result
mysql-test/suite/rpl/t/rpl_replicate_rewrite_db.test
modified:
sql/mysqld.cc
=== modified file 'mysql-test/suite/rpl/r/rpl_manual_change_index_file.result'
--- a/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result 2011-09-30 13:14:37 +0000
+++ b/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result 2011-10-03 11:49:38 +0000
@@ -5,7 +5,6 @@ CREATE TABLE t1(c1 INT);
FLUSH LOGS;
call mtr.add_suppression('Got fatal error 1236 from master when reading data from binary log: .*could not find next log');
include/wait_for_slave_io_error.inc [errno=1236]
-Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'could not find next log; the last event was read from 'master-bin.000002' at 251, the last byte read was read from 'master-bin.000002' at 251.''
CREATE TABLE t2(c1 INT);
FLUSH LOGS;
CREATE TABLE t3(c1 INT);
=== modified file 'mysql-test/suite/rpl/r/rpl_packet.result'
--- a/mysql-test/suite/rpl/r/rpl_packet.result 2011-09-30 13:14:37 +0000
+++ b/mysql-test/suite/rpl/r/rpl_packet.result 2011-10-03 11:49:38 +0000
@@ -37,7 +37,6 @@ DROP TABLE t1;
CREATE TABLE t1 (f1 int PRIMARY KEY, f2 LONGTEXT, f3 LONGTEXT) ENGINE=MyISAM;
INSERT INTO t1(f1, f2, f3) VALUES(1, REPEAT('a', @@global.max_allowed_packet), REPEAT('b', @@global.max_allowed_packet));
include/wait_for_slave_io_error.inc [errno=1236]
-Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'log event entry exceeded max_allowed_packet; Increase max_allowed_packet on master; the last event was read from 'master-bin.000001' at 484, the last byte read was read from 'master-bin.000001' at 503.''
STOP SLAVE;
RESET SLAVE;
RESET MASTER;
=== modified file 'mysql-test/suite/rpl/r/rpl_row_event_max_size.result'
--- a/mysql-test/suite/rpl/r/rpl_row_event_max_size.result 2011-09-30 13:14:37 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_event_max_size.result 2011-10-03 11:49:38 +0000
@@ -63,7 +63,6 @@ call mtr.add_suppression("Found invalid
call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
drop table t1;
include/wait_for_slave_io_error.inc [errno=1236]
-Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'log event entry exceeded max_allowed_packet; Increase max_allowed_packet on master; the last event was read from 'master-bin.000001' at 8098734, the last byte read was read from 'master-bin.000001' at 8098753.''
==== clean up ====
include/stop_slave_sql.inc
RESET SLAVE;
=== modified file 'mysql-test/suite/rpl/t/rpl_manual_change_index_file.test'
--- a/mysql-test/suite/rpl/t/rpl_manual_change_index_file.test 2011-01-17 10:10:06 +0000
+++ b/mysql-test/suite/rpl/t/rpl_manual_change_index_file.test 2011-10-03 11:49:38 +0000
@@ -61,7 +61,7 @@ call mtr.add_suppression('Got fatal erro
connection slave;
# 1236 = ER_MASTER_FATAL_ERROR_READING_BINLOG
--let $slave_io_errno= 1236
---let $show_slave_io_error= 1
+--let $show_slave_io_error= 0
--source include/wait_for_slave_io_error.inc
connection master;
=== modified file 'mysql-test/suite/rpl/t/rpl_packet.test'
--- a/mysql-test/suite/rpl/t/rpl_packet.test 2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_packet.test 2011-10-03 11:49:38 +0000
@@ -144,7 +144,7 @@ connection slave;
# The slave I/O thread must stop after receiving
# 1236=ER_MASTER_FATAL_ERROR_READING_BINLOG error message from master.
--let $slave_io_errno= 1236
---let $show_slave_io_error= 1
+--let $show_slave_io_error= 0
--source include/wait_for_slave_io_error.inc
# Remove the bad binlog and clear error status on slave.
=== modified file 'mysql-test/suite/rpl/t/rpl_row_event_max_size.test'
--- a/mysql-test/suite/rpl/t/rpl_row_event_max_size.test 2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_event_max_size.test 2011-10-03 11:49:38 +0000
@@ -73,7 +73,7 @@ call mtr.add_suppression("The slave coor
# Show slave last IO errno
drop table t1;
let $slave_io_errno= 1236;
-let $show_slave_io_error= 1;
+let $show_slave_io_error= 0;
source include/wait_for_slave_io_error.inc;
--echo ==== clean up ====
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (andrei.elkin:3469 to 3470) | Andrei Elkin | 3 Oct |
