List:Commits« Previous MessageNext Message »
From:Andrei Elkin Date:March 13 2011 7:57pm
Subject:bzr push into mysql-trunk branch (andrei.elkin:3756 to 3757) Bug#58754
Bug#11765758
View as plain text  
 3757 Andrei Elkin	2011-03-13
      Bug#11765758  bug#58754 RPL_CORRUPTION FAILED on mysql-trunk
      
      Simplifying the test further to use only unsigned "d" debug instructions.
      As in a previous commit logics don't suffer.
      
      The idea is to observe PB2 execution of the new version of the test on win-64.
     @ mysql-test/suite/rpl/r/rpl_corruption.result
        results got updated.
     @ mysql-test/suite/rpl/t/rpl_corruption.test
        replacing +|-d all around the tests.

    modified:
      mysql-test/suite/rpl/r/rpl_corruption.result
      mysql-test/suite/rpl/t/rpl_corruption.test
 3756 Mayank Prasad	2011-03-12
      Bug #11763174: INFORMATION_SCHEMA.PARAMETERS.NUMERIC_PRECISION SHOULD BE BIGINT
            
      Issue:
      ------
      The information_schema.PARAMETERS.NUMERIC_PRECISION and information_schema.ROUTINES.NUMERIC_PRECISION were INT whereas they should have been BIGINT(21) UNSIGNED.
            
      Solution:
      ---------
      Changed the metadata to return the new column types.
      Added a new test case in main.information_schema.test.
      Updated funcs_1.is_columns_is, main.information_schema_parameters and main.information_schema.routines test result to reflect the new type.
     @ mysql-test/r/information_schema.result
        Added expected result for test case added in main.information_schema.test.
     @ mysql-test/r/information_schema_parameters.result
        Updated test result to reflect the new column type.
     @ mysql-test/r/information_schema_routines.result
        Updated test result to reflect the new column type.
     @ mysql-test/suite/funcs_1/r/is_columns_is.result
        Updated test result to reflect the new column type.
     @ mysql-test/t/information_schema.test
        Added a new test case in main.information_schema.test.
     @ sql/sql_show.cc
        Changed information_schema.PARAMETERS.NUMERIC_PRECISION and information_schema.ROUTINES.NUMERIC_PRECISION to bigint(21) unsigned

    modified:
      mysql-test/r/information_schema.result
      mysql-test/r/information_schema_parameters.result
      mysql-test/r/information_schema_routines.result
      mysql-test/suite/funcs_1/r/is_columns_is.result
      mysql-test/t/information_schema.test
      sql/sql_show.cc
=== modified file 'mysql-test/suite/rpl/r/rpl_corruption.result'
--- a/mysql-test/suite/rpl/r/rpl_corruption.result	2011-03-11 09:35:38 +0000
+++ b/mysql-test/suite/rpl/r/rpl_corruption.result	2011-03-13 19:56:40 +0000
@@ -12,27 +12,27 @@ SET @old_master_verify_checksum = @@mast
 CREATE TABLE t1 (a INT NOT NULL PRIMARY KEY, b VARCHAR(10), c VARCHAR(100));
 include/stop_slave.inc
 # 2. Corruption in master binlog and SHOW BINLOG EVENTS
-SET GLOBAL debug="+d,corrupt_read_log_event_char";
+SET GLOBAL debug="d,corrupt_read_log_event_char";
 SHOW BINLOG EVENTS;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error
-SET GLOBAL debug="-d,corrupt_read_log_event_char";
+SET GLOBAL debug="";
 # 3. Master read a corrupted event from binlog and send the error to slave
-SET GLOBAL debug="+d,corrupt_read_log_event";
+SET GLOBAL debug="d,corrupt_read_log_event";
 START SLAVE IO_THREAD;
 include/wait_for_slave_io_error.inc [errno=1236]
-SET GLOBAL debug="-d,corrupt_read_log_event";
+SET GLOBAL debug="";
 # 4. Master read a corrupted event from binlog and send it to slave
 SET GLOBAL master_verify_checksum=0;
-SET GLOBAL debug="+d,corrupt_read_log_event";
+SET GLOBAL debug="d,corrupt_read_log_event";
 START SLAVE IO_THREAD;
-include/wait_for_slave_io_error.inc [errno=1595]
-SET GLOBAL debug="-d,corrupt_read_log_event";
+include/wait_for_slave_io_error.inc [errno=1595,1722]
+SET GLOBAL debug="";
 SET GLOBAL master_verify_checksum=1;
 # 5. Slave. Corruption in network
-SET GLOBAL debug="+d,corrupt_queue_event";
+SET GLOBAL debug="d,corrupt_queue_event";
 START SLAVE IO_THREAD;
-include/wait_for_slave_io_error.inc [errno=1595]
-SET GLOBAL debug="-d,corrupt_queue_event";
+include/wait_for_slave_io_error.inc [errno=1595,1722]
+SET GLOBAL debug="";
 # 6. Slave. Corruption in relay log
 SET GLOBAL debug="d,corrupt_read_log_event_char";
 START SLAVE;

=== modified file 'mysql-test/suite/rpl/t/rpl_corruption.test'
--- a/mysql-test/suite/rpl/t/rpl_corruption.test	2011-03-11 09:35:38 +0000
+++ b/mysql-test/suite/rpl/t/rpl_corruption.test	2011-03-13 19:56:40 +0000
@@ -56,62 +56,66 @@ while ($i) {  
 }
 --enable_query_log
 
+#
+# Bug #58630 shows `+d' syntax has a side effect Andrei changed it to
+# unsigned `d' version which does not affect the tests logics.
+# todo:
+# restore *all* following `SET GLOBAL debug' back to `+|-d' when Bug
+# #58630, OBug#11765758 sorted out
+#
+
 # Emulate corruption in binlog file when SHOW BINLOG EVENTS is executing
 --echo # 2. Corruption in master binlog and SHOW BINLOG EVENTS
-SET GLOBAL debug="+d,corrupt_read_log_event_char";
+SET GLOBAL debug="d,corrupt_read_log_event_char";
 --echo SHOW BINLOG EVENTS;
 --disable_query_log
 send_eval SHOW BINLOG EVENTS FROM $pos;
 --enable_query_log
 --error ER_ERROR_WHEN_EXECUTING_COMMAND
 reap;
-SET GLOBAL debug="-d,corrupt_read_log_event_char";
+
+# see above comments on `+d' syntax
+SET GLOBAL debug="";
 
 # Emulate corruption on master with crc checking on master
 --echo # 3. Master read a corrupted event from binlog and send the error to slave
-SET GLOBAL debug="+d,corrupt_read_log_event";
+SET GLOBAL debug="d,corrupt_read_log_event";
 --connection slave
 START SLAVE IO_THREAD;
 let $slave_io_errno= 1236;
 --source include/wait_for_slave_io_error.inc
 --connection master
-SET GLOBAL debug="-d,corrupt_read_log_event";
+SET GLOBAL debug="";
 
 # Emulate corruption on master without crc checking on master
 --echo # 4. Master read a corrupted event from binlog and send it to slave
 --connection master
 SET GLOBAL master_verify_checksum=0;
-SET GLOBAL debug="+d,corrupt_read_log_event";
+SET GLOBAL debug="d,corrupt_read_log_event";
 --connection slave
 START SLAVE IO_THREAD;
-let $slave_io_errno= 1595;
+let $slave_io_errno= 1595,1722;
 --source include/wait_for_slave_io_error.inc
 --connection master
-SET GLOBAL debug="-d,corrupt_read_log_event";
+SET GLOBAL debug="";
 SET GLOBAL master_verify_checksum=1;
 
 # Emulate corruption in network
 --echo # 5. Slave. Corruption in network
 --connection slave
-SET GLOBAL debug="+d,corrupt_queue_event";
+SET GLOBAL debug="d,corrupt_queue_event";
 START SLAVE IO_THREAD;
-let $slave_io_errno= 1595;
+let $slave_io_errno= 1595,1722;
 --source include/wait_for_slave_io_error.inc
-SET GLOBAL debug="-d,corrupt_queue_event";
+SET GLOBAL debug="";
 
 # Emulate corruption in relay log
 --echo # 6. Slave. Corruption in relay log
 
-#
-# Bug #58630 shows `+d' syntax has a side effect
-# Andrei changed it to unsigned `d' version which does not affect the tests logics.
-# todo: restore back to `+d' when  Bug #58630,  OBug#11765758 sorted out
-#
 SET GLOBAL debug="d,corrupt_read_log_event_char";
 START SLAVE;
 let $slave_sql_errno= 1593;
 --source include/wait_for_slave_sql_error.inc
-# see above comments on `+d' syntax
 
 SET GLOBAL debug="";
 


Attachment: [text/bzr-bundle] bzr/andrei.elkin@oracle.com-20110313195640-p5b2b8v4b0jq4bb2.bundle
Thread
bzr push into mysql-trunk branch (andrei.elkin:3756 to 3757) Bug#58754Bug#11765758Andrei Elkin14 Mar