bzr commit into mysql-next-mr branch (aelkin:3169)

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-mr-wl2540/ based on revid:aelkin@stripped

 3169 Andrei Elkin	2010-09-28
      manual merge next-mr to mext-mr-wl2540; sorting out result files, after bzr update

    modified:
      mysql-test/extra/rpl_tests/rpl_conflicts.test
      mysql-test/suite/rpl/r/rpl_checksum.result
      mysql-test/suite/rpl/r/rpl_row_conflicts.result
      mysql-test/suite/rpl/t/rpl_checksum.test
      mysql-test/suite/sys_vars/r/all_vars.result
=== modified file 'mysql-test/extra/rpl_tests/rpl_conflicts.test'
--- a/mysql-test/extra/rpl_tests/rpl_conflicts.test	2010-09-28 13:58:50 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_conflicts.test	2010-09-28 14:49:24 +0000
@@ -146,7 +146,10 @@ if (`SELECT @@global.binlog_format = 'RO
   source include/wait_for_slave_sql_error.inc;
   let $err= query_get_value("SHOW SLAVE STATUS", Last_SQL_Error, 1);
   let $err= `SELECT SUBSTRING("$err" FROM 17)`;
-  --echo Last_SQL_Error = $err (expected "can't find record" error)
+  --replace_regex /end_log_pos [0-9]+/end_log_pos END_LOG_POS/
+  --disable_query_log
+  --eval SELECT "$err" as 'Last_SQL_Error (expected "duplicate key" error)'
+  --enable_query_log
   SELECT * FROM t1;
 
   --echo ---- Resolve the conflict on the slave and restart SQL thread ----

=== modified file 'mysql-test/suite/rpl/r/rpl_checksum.result'
--- a/mysql-test/suite/rpl/r/rpl_checksum.result	2010-07-08 17:06:40 +0000
+++ b/mysql-test/suite/rpl/r/rpl_checksum.result	2010-09-28 14:49:24 +0000
@@ -64,7 +64,7 @@ set @@global.binlog_checksum = CRC32;
 insert into t1 values (1) /* will not be applied on slave due to simulation */;
 set @@global.debug='d,simulate_slave_unaware_checksum';
 start slave;
-*** Got IO thread error code: 1703, text: Slave can not handle replication events with the checksum that master is configured to log. ***
+*** Got IO thread error code: 1710, text: Slave can not handle replication events with the checksum that master is configured to log. ***
 select count(*) as zero from t1;
 zero
 0

=== modified file 'mysql-test/suite/rpl/r/rpl_row_conflicts.result'
--- a/mysql-test/suite/rpl/r/rpl_row_conflicts.result	2010-09-28 13:58:50 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_conflicts.result	2010-09-28 14:49:24 +0000
@@ -51,7 +51,8 @@ SELECT * FROM t1;
 a
 [on slave]
 ---- Wait until slave stops with an error ----
-Last_SQL_Errno = 1032 (expected "can't find record" error)
+Last_SQL_Error (expected "duplicate key" error)
+Could not execute Delete_rows event on table test.t1; Can't find record in 't1', Error_code: 1032; handler error HA_ERR_KEY_NOT_FOUND; the event's master log master-bin.000001, end_log_pos END_LOG_POS
 SELECT * FROM t1;
 a
 ---- Resolve the conflict on the slave and restart SQL thread ----

=== modified file 'mysql-test/suite/rpl/t/rpl_checksum.test'
--- a/mysql-test/suite/rpl/t/rpl_checksum.test	2010-06-14 10:04:20 +0000
+++ b/mysql-test/suite/rpl/t/rpl_checksum.test	2010-09-28 14:49:24 +0000
@@ -103,6 +103,8 @@ source include/wait_for_slave_io_to_stop
 
 let $errno= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1);
 let $error= query_get_value(SHOW SLAVE STATUS, Last_IO_Error, 1);
+let $error=`select substring("$error", 17)`;
+
 --echo *** Got IO thread error code: $errno, text: $error ***
 
 select count(*) as zero from t1;
@@ -145,6 +147,7 @@ start slave io_thread;
 source include/wait_for_slave_io_to_stop.inc;
 let $errno= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1);
 let $error= query_get_value(SHOW SLAVE STATUS, Last_IO_Error, 1);
+let $error=`select substring("$error", 17)`;
 --echo *** Got IO thread error code: $errno, text: $error ***
 set @@global.debug=''; # todo: merge
 
@@ -164,6 +167,7 @@ start slave sql_thread;
 source include/wait_for_slave_sql_to_stop.inc;
 let $errno= query_get_value(SHOW SLAVE STATUS, Last_SQL_Errno, 1);
 let $error= query_get_value(SHOW SLAVE STATUS, Last_SQL_Error, 1);
+let $error=`select substring("$error", 17)`;
 --echo *** Got SQL thread error code: $errno, text: $error ***
 
 # resuming SQL thread to parse out the event w/o the failure

=== modified file 'mysql-test/suite/sys_vars/r/all_vars.result'
--- a/mysql-test/suite/sys_vars/r/all_vars.result	2010-06-23 01:50:38 +0000
+++ b/mysql-test/suite/sys_vars/r/all_vars.result	2010-09-28 14:49:24 +0000
@@ -11,14 +11,20 @@ select variable_name as `There should be
 left join t1 on variable_name=test_name where test_name is null;
 There should be *no* variables listed below:
 INNODB_MONITOR_COUNTER_RESET
+SLAVE_SQL_VERIFY_CHECKSUM
 INNODB_MONITOR_COUNTER_RESET_ALL
 INNODB_MONITOR_COUNTER_ON
 INNODB_MONITOR_COUNTER_OFF
+BINLOG_CHECKSUM
+MASTER_VERIFY_CHECKSUM
 INNODB_FILE_FORMAT_MAX
 INNODB_MONITOR_COUNTER_RESET
+SLAVE_SQL_VERIFY_CHECKSUM
 INNODB_MONITOR_COUNTER_RESET_ALL
 INNODB_MONITOR_COUNTER_ON
 INNODB_MONITOR_COUNTER_OFF
+BINLOG_CHECKSUM
+MASTER_VERIFY_CHECKSUM
 INNODB_FILE_FORMAT_MAX
 drop table t1;
 drop table t2;


Attachment: [text/bzr-bundle] bzr/[e-mail]