bzr push into mysql-5.6 branch (astha.pareek:4128 to 4129) Bug#14340819

[Astha Pareek]

 4129 Astha Pareek	2012-08-10
      BUG#14340819 MTR NOT MASKING THE WARNING NUMBER AFTER CHANGE MASTER
      IN RPL_SLAVE_NET_TIMEOUT 
      
      Problem:
      MTR does not mask the warning number being thrown after change master in
      rpl_slave_net_timeout.test. Ideally all such warning numbers should
      be masked with #. But for
      mysql-test/suite/large_tests/r/rpl_slave_net_timeout.test, 1st warning
      number is masked properly, but it fails to mask the 2nd warning number,
      causes a result mismatch for this test. 
      
      Fix:
      Masked the warning number for rpl_slave_net_timeout.test

    modified:
      mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result
      mysql-test/suite/large_tests/t/rpl_slave_net_timeout.test
 4128 Jimmy Yang	2012-08-10
      fix Bug #14347352 - FTS INNODB READONLY WORKLOAD CRASHES MYSQL
            
      rb://1203 approved by Sunny Bains

    modified:
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/row0mysql.h
      storage/innobase/row/row0sel.cc
=== modified file 'mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result'
--- a/mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result	2011-11-21 09:59:30 +0000
+++ b/mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result	2012-08-10 09:39:26 +0000
@@ -1,7 +1,7 @@
 include/master-slave.inc
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	1757	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 set @save_general_log = @@global.general_log;
 set @save_log_output = @@global.log_output;
@@ -12,8 +12,8 @@ include/stop_slave.inc
 change master to master_host = '127.0.0.1',master_port = MASTER_PORT,
 master_user = 'root', master_heartbeat_period = 0;
 Warnings:
-Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
-Note	1757	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
+Note	####	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	####	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 set @@global.slave_net_timeout = @@global.net_read_timeout * 2;
 include/start_slave.inc
 include/stop_slave.inc

=== modified file 'mysql-test/suite/large_tests/t/rpl_slave_net_timeout.test'
--- a/mysql-test/suite/large_tests/t/rpl_slave_net_timeout.test	2011-03-17 10:31:42 +0000
+++ b/mysql-test/suite/large_tests/t/rpl_slave_net_timeout.test	2012-08-10 09:39:26 +0000
@@ -33,7 +33,8 @@ connection slave;
 # slave.net_read_timeout < slave_net_timeout
 # won't cause reconnecting by the slave within at least 
 # slave_net_timeout interval.
---replace_result $MASTER_MYPORT MASTER_PORT 
+--replace_result $MASTER_MYPORT MASTER_PORT
+--replace_column 2 #### 
 eval change master to master_host = '127.0.0.1',master_port = $MASTER_MYPORT,
 master_user = 'root', master_heartbeat_period = 0;
 

No bundle (reason: useless for push emails).