List:Commits« Previous MessageNext Message »
From:prabakaran thirumalai Date:July 6 2012 5:58am
Subject:bzr push into mysql-5.6 branch (prabakaran.thirumalai:3983 to 3984)
Bug#14195056
View as plain text  
 3984 prabakaran thirumalai	2012-07-06
      Bug#14195056 MAKE SURE UPGRADES SET STATS_PERSISTENT=0 IN ALL
      INNODB SYSTEM TABLES
      
      Followup patch for big test result file changes

    modified:
      mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result
      mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe_checksum.result
      mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result
 3983 Dao gang Qu	2012-07-06
      Fix Bug #14219515    DUPLICATE VALUE NOT REPORTED FOR ADD PRIMARY KEY
      rb://1156 approved by Jimmy Yang

    added:
      mysql-test/suite/innodb/r/innodb-bug14219515.result
      mysql-test/suite/innodb/t/innodb-bug14219515.test
    modified:
      storage/innobase/handler/handler0alter.cc
=== modified file 'mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result	2012-04-11 16:52:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result	2012-07-06 05:48:34 +0000
@@ -352,7 +352,7 @@ slave_master_info	CREATE TABLE `slave_ma
   `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files',
   `Enabled_auto_position` tinyint(1) NOT NULL COMMENT 'Indicates whether GTIDs will be used to retrieve events from the master.',
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Master Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
 Table	Create Table
 slave_relay_log_info	CREATE TABLE `slave_relay_log_info` (
@@ -365,7 +365,7 @@ slave_relay_log_info	CREATE TABLE `slave
   `Sql_delay` int(11) NOT NULL COMMENT 'The number of seconds that the slave must lag behind the master.',
   `Number_of_workers` int(10) unsigned NOT NULL,
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Relay Log Information'
 SHOW CREATE TABLE mysql.slave_worker_info;
 Table	Create Table
 slave_worker_info	CREATE TABLE `slave_worker_info` (
@@ -383,7 +383,7 @@ slave_worker_info	CREATE TABLE `slave_wo
   `Checkpoint_group_size` int(10) unsigned NOT NULL,
   `Checkpoint_group_bitmap` blob NOT NULL,
   PRIMARY KEY (`Master_id`,`Worker_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Worker Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Worker Information'
 ALTER TABLE mysql.slave_master_info ENGINE= Innodb;
 ALTER TABLE mysql.slave_relay_log_info ENGINE= Innodb;
 ALTER TABLE mysql.slave_worker_info ENGINE= Innodb;
@@ -415,7 +415,7 @@ slave_master_info	CREATE TABLE `slave_ma
   `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files',
   `Enabled_auto_position` tinyint(1) NOT NULL COMMENT 'Indicates whether GTIDs will be used to retrieve events from the master.',
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Master Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
 Table	Create Table
 slave_relay_log_info	CREATE TABLE `slave_relay_log_info` (
@@ -428,7 +428,7 @@ slave_relay_log_info	CREATE TABLE `slave
   `Sql_delay` int(11) NOT NULL COMMENT 'The number of seconds that the slave must lag behind the master.',
   `Number_of_workers` int(10) unsigned NOT NULL,
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Relay Log Information'
 SHOW CREATE TABLE mysql.slave_worker_info;
 Table	Create Table
 slave_worker_info	CREATE TABLE `slave_worker_info` (
@@ -446,7 +446,7 @@ slave_worker_info	CREATE TABLE `slave_wo
   `Checkpoint_group_size` int(10) unsigned NOT NULL,
   `Checkpoint_group_bitmap` blob NOT NULL,
   PRIMARY KEY (`Master_id`,`Worker_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Worker Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Worker Information'
 ==== end rpl_mts_crash_safe.inc:configure ====
 ########################################################################
 #                                TEST 

=== modified file 'mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result	2012-04-11 16:52:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result	2012-07-06 05:48:34 +0000
@@ -352,7 +352,7 @@ slave_master_info	CREATE TABLE `slave_ma
   `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files',
   `Enabled_auto_position` tinyint(1) NOT NULL COMMENT 'Indicates whether GTIDs will be used to retrieve events from the master.',
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Master Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
 Table	Create Table
 slave_relay_log_info	CREATE TABLE `slave_relay_log_info` (
@@ -365,7 +365,7 @@ slave_relay_log_info	CREATE TABLE `slave
   `Sql_delay` int(11) NOT NULL COMMENT 'The number of seconds that the slave must lag behind the master.',
   `Number_of_workers` int(10) unsigned NOT NULL,
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Relay Log Information'
 SHOW CREATE TABLE mysql.slave_worker_info;
 Table	Create Table
 slave_worker_info	CREATE TABLE `slave_worker_info` (
@@ -383,7 +383,7 @@ slave_worker_info	CREATE TABLE `slave_wo
   `Checkpoint_group_size` int(10) unsigned NOT NULL,
   `Checkpoint_group_bitmap` blob NOT NULL,
   PRIMARY KEY (`Master_id`,`Worker_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Worker Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Worker Information'
 ALTER TABLE mysql.slave_master_info ENGINE= Innodb;
 ALTER TABLE mysql.slave_relay_log_info ENGINE= Innodb;
 ALTER TABLE mysql.slave_worker_info ENGINE= Innodb;
@@ -415,7 +415,7 @@ slave_master_info	CREATE TABLE `slave_ma
   `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files',
   `Enabled_auto_position` tinyint(1) NOT NULL COMMENT 'Indicates whether GTIDs will be used to retrieve events from the master.',
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Master Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
 Table	Create Table
 slave_relay_log_info	CREATE TABLE `slave_relay_log_info` (
@@ -428,7 +428,7 @@ slave_relay_log_info	CREATE TABLE `slave
   `Sql_delay` int(11) NOT NULL COMMENT 'The number of seconds that the slave must lag behind the master.',
   `Number_of_workers` int(10) unsigned NOT NULL,
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Relay Log Information'
 SHOW CREATE TABLE mysql.slave_worker_info;
 Table	Create Table
 slave_worker_info	CREATE TABLE `slave_worker_info` (
@@ -446,7 +446,7 @@ slave_worker_info	CREATE TABLE `slave_wo
   `Checkpoint_group_size` int(10) unsigned NOT NULL,
   `Checkpoint_group_bitmap` blob NOT NULL,
   PRIMARY KEY (`Master_id`,`Worker_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Worker Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Worker Information'
 ==== end rpl_mts_crash_safe.inc:configure ====
 ########################################################################
 #                                TEST 

=== modified file 'mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe_checksum.result'
--- a/mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe_checksum.result	2012-04-11 16:52:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe_checksum.result	2012-07-06 05:48:34 +0000
@@ -352,7 +352,7 @@ slave_master_info	CREATE TABLE `slave_ma
   `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files',
   `Enabled_auto_position` tinyint(1) NOT NULL COMMENT 'Indicates whether GTIDs will be used to retrieve events from the master.',
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Master Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
 Table	Create Table
 slave_relay_log_info	CREATE TABLE `slave_relay_log_info` (
@@ -365,7 +365,7 @@ slave_relay_log_info	CREATE TABLE `slave
   `Sql_delay` int(11) NOT NULL COMMENT 'The number of seconds that the slave must lag behind the master.',
   `Number_of_workers` int(10) unsigned NOT NULL,
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Relay Log Information'
 SHOW CREATE TABLE mysql.slave_worker_info;
 Table	Create Table
 slave_worker_info	CREATE TABLE `slave_worker_info` (
@@ -383,7 +383,7 @@ slave_worker_info	CREATE TABLE `slave_wo
   `Checkpoint_group_size` int(10) unsigned NOT NULL,
   `Checkpoint_group_bitmap` blob NOT NULL,
   PRIMARY KEY (`Master_id`,`Worker_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Worker Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Worker Information'
 ALTER TABLE mysql.slave_master_info ENGINE= Innodb;
 ALTER TABLE mysql.slave_relay_log_info ENGINE= Innodb;
 ALTER TABLE mysql.slave_worker_info ENGINE= Innodb;
@@ -415,7 +415,7 @@ slave_master_info	CREATE TABLE `slave_ma
   `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files',
   `Enabled_auto_position` tinyint(1) NOT NULL COMMENT 'Indicates whether GTIDs will be used to retrieve events from the master.',
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Master Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
 Table	Create Table
 slave_relay_log_info	CREATE TABLE `slave_relay_log_info` (
@@ -428,7 +428,7 @@ slave_relay_log_info	CREATE TABLE `slave
   `Sql_delay` int(11) NOT NULL COMMENT 'The number of seconds that the slave must lag behind the master.',
   `Number_of_workers` int(10) unsigned NOT NULL,
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Relay Log Information'
 SHOW CREATE TABLE mysql.slave_worker_info;
 Table	Create Table
 slave_worker_info	CREATE TABLE `slave_worker_info` (
@@ -446,7 +446,7 @@ slave_worker_info	CREATE TABLE `slave_wo
   `Checkpoint_group_size` int(10) unsigned NOT NULL,
   `Checkpoint_group_bitmap` blob NOT NULL,
   PRIMARY KEY (`Master_id`,`Worker_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Worker Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Worker Information'
 ==== end rpl_mts_crash_safe.inc:configure ====
 ########################################################################
 #                                TEST 

=== modified file 'mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result	2012-04-11 16:52:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result	2012-07-06 05:48:34 +0000
@@ -352,7 +352,7 @@ slave_master_info	CREATE TABLE `slave_ma
   `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files',
   `Enabled_auto_position` tinyint(1) NOT NULL COMMENT 'Indicates whether GTIDs will be used to retrieve events from the master.',
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Master Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
 Table	Create Table
 slave_relay_log_info	CREATE TABLE `slave_relay_log_info` (
@@ -365,7 +365,7 @@ slave_relay_log_info	CREATE TABLE `slave
   `Sql_delay` int(11) NOT NULL COMMENT 'The number of seconds that the slave must lag behind the master.',
   `Number_of_workers` int(10) unsigned NOT NULL,
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Relay Log Information'
 SHOW CREATE TABLE mysql.slave_worker_info;
 Table	Create Table
 slave_worker_info	CREATE TABLE `slave_worker_info` (
@@ -383,7 +383,7 @@ slave_worker_info	CREATE TABLE `slave_wo
   `Checkpoint_group_size` int(10) unsigned NOT NULL,
   `Checkpoint_group_bitmap` blob NOT NULL,
   PRIMARY KEY (`Master_id`,`Worker_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Worker Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Worker Information'
 ALTER TABLE mysql.slave_master_info ENGINE= Innodb;
 ALTER TABLE mysql.slave_relay_log_info ENGINE= Innodb;
 ALTER TABLE mysql.slave_worker_info ENGINE= Innodb;
@@ -415,7 +415,7 @@ slave_master_info	CREATE TABLE `slave_ma
   `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files',
   `Enabled_auto_position` tinyint(1) NOT NULL COMMENT 'Indicates whether GTIDs will be used to retrieve events from the master.',
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Master Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
 Table	Create Table
 slave_relay_log_info	CREATE TABLE `slave_relay_log_info` (
@@ -428,7 +428,7 @@ slave_relay_log_info	CREATE TABLE `slave
   `Sql_delay` int(11) NOT NULL COMMENT 'The number of seconds that the slave must lag behind the master.',
   `Number_of_workers` int(10) unsigned NOT NULL,
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Relay Log Information'
 SHOW CREATE TABLE mysql.slave_worker_info;
 Table	Create Table
 slave_worker_info	CREATE TABLE `slave_worker_info` (
@@ -446,7 +446,7 @@ slave_worker_info	CREATE TABLE `slave_wo
   `Checkpoint_group_size` int(10) unsigned NOT NULL,
   `Checkpoint_group_bitmap` blob NOT NULL,
   PRIMARY KEY (`Master_id`,`Worker_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Worker Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Worker Information'
 ==== end rpl_mts_crash_safe.inc:configure ====
 ########################################################################
 #                                TEST 

=== modified file 'mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result	2012-04-11 16:52:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result	2012-07-06 05:48:34 +0000
@@ -352,7 +352,7 @@ slave_master_info	CREATE TABLE `slave_ma
   `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files',
   `Enabled_auto_position` tinyint(1) NOT NULL COMMENT 'Indicates whether GTIDs will be used to retrieve events from the master.',
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Master Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
 Table	Create Table
 slave_relay_log_info	CREATE TABLE `slave_relay_log_info` (
@@ -365,7 +365,7 @@ slave_relay_log_info	CREATE TABLE `slave
   `Sql_delay` int(11) NOT NULL COMMENT 'The number of seconds that the slave must lag behind the master.',
   `Number_of_workers` int(10) unsigned NOT NULL,
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Relay Log Information'
 SHOW CREATE TABLE mysql.slave_worker_info;
 Table	Create Table
 slave_worker_info	CREATE TABLE `slave_worker_info` (
@@ -383,7 +383,7 @@ slave_worker_info	CREATE TABLE `slave_wo
   `Checkpoint_group_size` int(10) unsigned NOT NULL,
   `Checkpoint_group_bitmap` blob NOT NULL,
   PRIMARY KEY (`Master_id`,`Worker_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Worker Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Worker Information'
 ALTER TABLE mysql.slave_master_info ENGINE= Innodb;
 ALTER TABLE mysql.slave_relay_log_info ENGINE= Innodb;
 ALTER TABLE mysql.slave_worker_info ENGINE= Innodb;
@@ -415,7 +415,7 @@ slave_master_info	CREATE TABLE `slave_ma
   `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files',
   `Enabled_auto_position` tinyint(1) NOT NULL COMMENT 'Indicates whether GTIDs will be used to retrieve events from the master.',
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Master Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
 Table	Create Table
 slave_relay_log_info	CREATE TABLE `slave_relay_log_info` (
@@ -428,7 +428,7 @@ slave_relay_log_info	CREATE TABLE `slave
   `Sql_delay` int(11) NOT NULL COMMENT 'The number of seconds that the slave must lag behind the master.',
   `Number_of_workers` int(10) unsigned NOT NULL,
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Relay Log Information'
 SHOW CREATE TABLE mysql.slave_worker_info;
 Table	Create Table
 slave_worker_info	CREATE TABLE `slave_worker_info` (
@@ -446,7 +446,7 @@ slave_worker_info	CREATE TABLE `slave_wo
   `Checkpoint_group_size` int(10) unsigned NOT NULL,
   `Checkpoint_group_bitmap` blob NOT NULL,
   PRIMARY KEY (`Master_id`,`Worker_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Worker Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Worker Information'
 ==== end rpl_mts_crash_safe.inc:configure ====
 ########################################################################
 #                                TEST 

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result	2012-04-04 07:06:53 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result	2012-07-06 05:48:34 +0000
@@ -24,7 +24,7 @@ slave_relay_log_info	CREATE TABLE `slave
   `Sql_delay` int(11) NOT NULL COMMENT 'The number of seconds that the slave must lag behind the master.',
   `Number_of_workers` int(10) unsigned NOT NULL,
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Relay Log Information'
 SHOW CREATE TABLE mysql.slave_worker_info;
 Table	Create Table
 slave_worker_info	CREATE TABLE `slave_worker_info` (
@@ -42,7 +42,7 @@ slave_worker_info	CREATE TABLE `slave_wo
   `Checkpoint_group_size` int(10) unsigned NOT NULL,
   `Checkpoint_group_bitmap` blob NOT NULL,
   PRIMARY KEY (`Master_id`,`Worker_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Worker Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Worker Information'
 ALTER TABLE mysql.slave_relay_log_info ENGINE= Innodb;
 ALTER TABLE mysql.slave_worker_info ENGINE= Innodb;
 SHOW CREATE TABLE mysql.slave_relay_log_info;
@@ -57,7 +57,7 @@ slave_relay_log_info	CREATE TABLE `slave
   `Sql_delay` int(11) NOT NULL COMMENT 'The number of seconds that the slave must lag behind the master.',
   `Number_of_workers` int(10) unsigned NOT NULL,
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Relay Log Information'
 SHOW CREATE TABLE mysql.slave_worker_info;
 Table	Create Table
 slave_worker_info	CREATE TABLE `slave_worker_info` (
@@ -75,7 +75,7 @@ slave_worker_info	CREATE TABLE `slave_wo
   `Checkpoint_group_size` int(10) unsigned NOT NULL,
   `Checkpoint_group_bitmap` blob NOT NULL,
   PRIMARY KEY (`Master_id`,`Worker_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Worker Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Worker Information'
 include/start_slave.inc
 rpl_mixing_engines.inc [commands=configure]
 CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result	2012-04-11 16:52:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result	2012-07-06 05:48:34 +0000
@@ -352,7 +352,7 @@ slave_master_info	CREATE TABLE `slave_ma
   `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files',
   `Enabled_auto_position` tinyint(1) NOT NULL COMMENT 'Indicates whether GTIDs will be used to retrieve events from the master.',
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Master Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
 Table	Create Table
 slave_relay_log_info	CREATE TABLE `slave_relay_log_info` (
@@ -365,7 +365,7 @@ slave_relay_log_info	CREATE TABLE `slave
   `Sql_delay` int(11) NOT NULL COMMENT 'The number of seconds that the slave must lag behind the master.',
   `Number_of_workers` int(10) unsigned NOT NULL,
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Relay Log Information'
 SHOW CREATE TABLE mysql.slave_worker_info;
 Table	Create Table
 slave_worker_info	CREATE TABLE `slave_worker_info` (
@@ -383,7 +383,7 @@ slave_worker_info	CREATE TABLE `slave_wo
   `Checkpoint_group_size` int(10) unsigned NOT NULL,
   `Checkpoint_group_bitmap` blob NOT NULL,
   PRIMARY KEY (`Master_id`,`Worker_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Worker Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Worker Information'
 ALTER TABLE mysql.slave_master_info ENGINE= Innodb;
 ALTER TABLE mysql.slave_relay_log_info ENGINE= Innodb;
 ALTER TABLE mysql.slave_worker_info ENGINE= Innodb;
@@ -415,7 +415,7 @@ slave_master_info	CREATE TABLE `slave_ma
   `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files',
   `Enabled_auto_position` tinyint(1) NOT NULL COMMENT 'Indicates whether GTIDs will be used to retrieve events from the master.',
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Master Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
 Table	Create Table
 slave_relay_log_info	CREATE TABLE `slave_relay_log_info` (
@@ -428,7 +428,7 @@ slave_relay_log_info	CREATE TABLE `slave
   `Sql_delay` int(11) NOT NULL COMMENT 'The number of seconds that the slave must lag behind the master.',
   `Number_of_workers` int(10) unsigned NOT NULL,
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Relay Log Information'
 SHOW CREATE TABLE mysql.slave_worker_info;
 Table	Create Table
 slave_worker_info	CREATE TABLE `slave_worker_info` (
@@ -446,7 +446,7 @@ slave_worker_info	CREATE TABLE `slave_wo
   `Checkpoint_group_size` int(10) unsigned NOT NULL,
   `Checkpoint_group_bitmap` blob NOT NULL,
   PRIMARY KEY (`Master_id`,`Worker_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Worker Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Worker Information'
 ==== end rpl_mts_crash_safe.inc:configure ====
 ########################################################################
 #                                TEST 

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result	2012-04-11 16:52:28 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result	2012-07-06 05:48:34 +0000
@@ -352,7 +352,7 @@ slave_master_info	CREATE TABLE `slave_ma
   `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files',
   `Enabled_auto_position` tinyint(1) NOT NULL COMMENT 'Indicates whether GTIDs will be used to retrieve events from the master.',
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Master Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
 Table	Create Table
 slave_relay_log_info	CREATE TABLE `slave_relay_log_info` (
@@ -365,7 +365,7 @@ slave_relay_log_info	CREATE TABLE `slave
   `Sql_delay` int(11) NOT NULL COMMENT 'The number of seconds that the slave must lag behind the master.',
   `Number_of_workers` int(10) unsigned NOT NULL,
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Relay Log Information'
 SHOW CREATE TABLE mysql.slave_worker_info;
 Table	Create Table
 slave_worker_info	CREATE TABLE `slave_worker_info` (
@@ -383,7 +383,7 @@ slave_worker_info	CREATE TABLE `slave_wo
   `Checkpoint_group_size` int(10) unsigned NOT NULL,
   `Checkpoint_group_bitmap` blob NOT NULL,
   PRIMARY KEY (`Master_id`,`Worker_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Worker Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Worker Information'
 ALTER TABLE mysql.slave_master_info ENGINE= Innodb;
 ALTER TABLE mysql.slave_relay_log_info ENGINE= Innodb;
 ALTER TABLE mysql.slave_worker_info ENGINE= Innodb;
@@ -415,7 +415,7 @@ slave_master_info	CREATE TABLE `slave_ma
   `Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files',
   `Enabled_auto_position` tinyint(1) NOT NULL COMMENT 'Indicates whether GTIDs will be used to retrieve events from the master.',
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Master Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Master Information'
 SHOW CREATE TABLE mysql.slave_relay_log_info;
 Table	Create Table
 slave_relay_log_info	CREATE TABLE `slave_relay_log_info` (
@@ -428,7 +428,7 @@ slave_relay_log_info	CREATE TABLE `slave
   `Sql_delay` int(11) NOT NULL COMMENT 'The number of seconds that the slave must lag behind the master.',
   `Number_of_workers` int(10) unsigned NOT NULL,
   PRIMARY KEY (`Master_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Relay Log Information'
 SHOW CREATE TABLE mysql.slave_worker_info;
 Table	Create Table
 slave_worker_info	CREATE TABLE `slave_worker_info` (
@@ -446,7 +446,7 @@ slave_worker_info	CREATE TABLE `slave_wo
   `Checkpoint_group_size` int(10) unsigned NOT NULL,
   `Checkpoint_group_bitmap` blob NOT NULL,
   PRIMARY KEY (`Master_id`,`Worker_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Worker Information'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Worker Information'
 ==== end rpl_mts_crash_safe.inc:configure ====
 ########################################################################
 #                                TEST 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.6 branch (prabakaran.thirumalai:3983 to 3984)Bug#14195056prabakaran thirumalai6 Jul