From: Sergey Vojtovich
Date: June 25 2012 7:24am
Subject: bzr push into mysql-trunk branch (sergey.vojtovich:3899 to 3900) WL#6216
List-Archive: http://lists.mysql.com/commits/144301
Message-Id: <201206250723.q5P7NtQo013466@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3900 Sergey Vojtovich	2012-06-25
      Fixed innodb-restart failure detected after push of WL#6216.

    modified:
      mysql-test/suite/innodb/r/innodb-restart.result
      mysql-test/suite/innodb/t/innodb-restart.test
 3899 Gopal Shankar	2012-06-24
      WL#6292 - Make TIMESTAMP columns nullable by default.
      
      This patch represents post-push fixes to address following issues:
      
      Change1) The following is done as part of Bug#14162406.
      #1: one valgrind issue visible with e.g rpl_udf,
      #2: rpl_wl6292 failed with mismatch in MTS mode.
      
      Fixed avoiding read deleted but not-nullified
      Slave_worker::info_thd (#1),
      correcting Slave_worker::set_rli_description_event() to match
      the Coordinator's branch logic (#2).
      
      Change2)
      * Do not show deprecation warning with --help option.
        This avoids extra warning displayed on every MTR run.

    modified:
      sql/mysqld.cc
      sql/rpl_rli.cc
      sql/rpl_rli_pdb.h
      sql/rpl_slave.cc
=== modified file 'mysql-test/suite/innodb/r/innodb-restart.result'
--- a/mysql-test/suite/innodb/r/innodb-restart.result	2012-06-22 10:10:42 +0000
+++ b/mysql-test/suite/innodb/r/innodb-restart.result	2012-06-25 07:17:37 +0000
@@ -212,13 +212,8 @@ test/t7#p#p0#sp#s1	8	Barracuda	Dynamic
 test/t7#p#p1#sp#s2	8	Barracuda	Dynamic
 test/t7#p#p1#sp#s3	8	Barracuda	Dynamic
 SELECT name,file_format,row_format
-FROM information_schema.innodb_sys_tablespaces;
+FROM information_schema.innodb_sys_tablespaces WHERE name LIKE 'test%';
 name	file_format	row_format
-mysql/innodb_table_stats	Antelope	Compact or Redundant
-mysql/innodb_index_stats	Antelope	Compact or Redundant
-mysql/slave_relay_log_info	Antelope	Compact or Redundant
-mysql/slave_master_info	Antelope	Compact or Redundant
-mysql/slave_worker_info	Antelope	Compact or Redundant
 test/t1	Antelope	Compact or Redundant
 test/t2	Antelope	Compact or Redundant
 test/t3	Barracuda	Compressed
@@ -414,13 +409,8 @@ test/t7#p#p0#sp#s1	8	Barracuda	Dynamic
 test/t7#p#p1#sp#s2	8	Barracuda	Dynamic
 test/t7#p#p1#sp#s3	8	Barracuda	Dynamic
 SELECT name,file_format,row_format
-FROM information_schema.innodb_sys_tablespaces;
+FROM information_schema.innodb_sys_tablespaces WHERE name LIKE 'test%';
 name	file_format	row_format
-mysql/innodb_table_stats	Antelope	Compact or Redundant
-mysql/innodb_index_stats	Antelope	Compact or Redundant
-mysql/slave_relay_log_info	Antelope	Compact or Redundant
-mysql/slave_master_info	Antelope	Compact or Redundant
-mysql/slave_worker_info	Antelope	Compact or Redundant
 test/t1	Antelope	Compact or Redundant
 test/t2	Antelope	Compact or Redundant
 test/t3	Barracuda	Compressed

=== modified file 'mysql-test/suite/innodb/t/innodb-restart.test'
--- a/mysql-test/suite/innodb/t/innodb-restart.test	2012-06-22 10:10:42 +0000
+++ b/mysql-test/suite/innodb/t/innodb-restart.test	2012-06-25 07:17:37 +0000
@@ -153,7 +153,7 @@ SELECT name,n_cols,file_format,row_forma
        FROM information_schema.innodb_sys_tables WHERE name like 'test%';
 --replace_regex  /#P#/#p#/  /#SP#/#sp#/
 SELECT name,file_format,row_format
-       FROM information_schema.innodb_sys_tablespaces;
+       FROM information_schema.innodb_sys_tablespaces WHERE name LIKE 'test%';
 --replace_regex  /#P#/#p#/  /#SP#/#sp#/
 --replace_result ./ MYSQL_DATA_DIR/  $MYSQL_DATA_DIR MYSQL_DATA_DIR  $MYSQL_TMP_DIR MYSQL_TMP_DIR
 SELECT path FROM information_schema.innodb_sys_datafiles
@@ -211,7 +211,7 @@ SELECT name,n_cols,file_format,row_forma
        FROM information_schema.innodb_sys_tables WHERE name like 'test%';
 --replace_regex  /#P#/#p#/  /#SP#/#sp#/
 SELECT name,file_format,row_format
-       FROM information_schema.innodb_sys_tablespaces;
+       FROM information_schema.innodb_sys_tablespaces WHERE name LIKE 'test%';
 --replace_regex  /#P#/#p#/  /#SP#/#sp#/
 --replace_result ./ MYSQL_DATA_DIR/  $MYSQL_DATA_DIR MYSQL_DATA_DIR  $MYSQL_TMP_DIR MYSQL_TMP_DIR
 SELECT path FROM information_schema.innodb_sys_datafiles

No bundle (reason: useless for push emails).