bzr push into mysql-5.6 branch (nisha.gopalakrishnan:4082 to 4083) Bug#11748842

[Nisha Gopalakrishnan]

 4083 Nisha Gopalakrishnan	2012-07-30
      BUG#11748842:CREATE TABLE: NO WARNING IF REQUESTED DUPLICATE INDEX FOR
                   THE SAME COLUMN.
      
      Follow up patch to update the innodb_index_large_prefix_8k result file.

    modified:
      mysql-test/suite/innodb/r/innodb_index_large_prefix_8k.result
 4082 Manish Kumar	2012-07-30
      BUG#14237992 - RPL_SEMI_SYNC FAILURES ON TRUNK AS PART OF WL#5223
      
      The rpl_semi_sync_master_timeout duration is increased to 30 sec to 
      increase the duration when the semi-sync replication waits for the 
      acks from the slave before it shifts to asynchronous replication.
      The timeout duration is increased from 10sec to 30 sec.

    modified:
      mysql-test/suite/rpl/r/rpl_semi_sync.result
      mysql-test/suite/rpl/t/rpl_semi_sync.test
=== modified file 'mysql-test/suite/innodb/r/innodb_index_large_prefix_8k.result'
--- a/mysql-test/suite/innodb/r/innodb_index_large_prefix_8k.result	2012-05-29 06:44:58 +0000
+++ b/mysql-test/suite/innodb/r/innodb_index_large_prefix_8k.result	2012-07-30 09:37:33 +0000
@@ -164,8 +164,11 @@ show warnings;
 Level	Code	Message
 Warning	1071	Specified key was too long; max key length is 1536 bytes
 create index idx4 on worklog5743_4(a2(1536));
+Warnings:
+Note	1831	Duplicate index 'idx4' defined on the table 'test.worklog5743_4'. This is deprecated and will be disallowed in a future release.
 show warnings;
 Level	Code	Message
+Note	1831	Duplicate index 'idx4' defined on the table 'test.worklog5743_4'. This is deprecated and will be disallowed in a future release.
 create index idx5 on worklog5743_4(a1, a2(1533));
 ERROR 42000: Specified key was too long; max key length is 1536 bytes
 show warnings;

No bundle (reason: useless for push emails).