bzr push into mysql-trunk branch (mayank.prasad:3712 to 3713) Bug#12427262

[Mayank Prasad]

 3713 Mayank Prasad	2012-04-21 [merge]
      BUG#12427262 : 60961: SHOW TABLES VERY SLOW WHEN NOT IN SYSTEM DISK CACHE
      
      Details:
       - Merge: mysql-5.5 -> mysql-trunk
       - Test case result modification.
       - enabling test case on windows.

    modified:
      mysql-test/collections/default.experimental
      mysql-test/r/bug12427262.result
      mysql-test/t/bug12427262.test
 3712 Nuno Carvalho	2012-04-20 [merge]
      BUG#13979418: SHOW BINLOG EVENTS MAY CRASH THE SERVER
      
      Merge from 5.5 into 5.6.
      
      Conflicts:
       * sql/binlog.cc
       * mysql-test/suite/rpl/r/rpl_parallel_show_binlog_events_purge_logs.result

    added:
      mysql-test/suite/rpl/r/rpl_parallel_show_binlog_events_purge_logs.result
      mysql-test/suite/rpl/t/rpl_parallel_show_binlog_events_purge_logs.test
    modified:
      sql/binlog.cc
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2012-04-20 11:32:32 +0000
+++ b/mysql-test/collections/default.experimental	2012-04-21 00:00:38 +0000
@@ -13,7 +13,6 @@ main.sp @solaris
 main.bug33509 @solaris                   # Bug#11753919 2012-02-16 didrik Several test cases fail on Solaris with error Thread stack overrun
 
 main.kill @freebsd                       # Bug#12619719 2011-08-04 Occasional failure in PB2
-main.bug12427262 @windows                # Bug#12427262 2012-04-20 Hemant Fails on mysql-trunk on Windows after Mayank push
 
 innodb.innodb_monitor                    # Bug#12320827 2011-08-04 Occasional failure in PB2
 

=== modified file 'mysql-test/r/bug12427262.result'
--- a/mysql-test/r/bug12427262.result	2012-04-19 10:29:46 +0000
+++ b/mysql-test/r/bug12427262.result	2012-04-21 00:00:38 +0000
@@ -1,8 +1,8 @@
 #
 # Bug#12427262 : 60961: SHOW TABLES VERY SLOW WHEN NOT IN SYSTEM DISK CACHE. 
 #
-create database show_table_db;
-use show_table_db;
+create database show_table_lw_db;
+use show_table_lw_db;
 create table t1 (c1 int);
 create table t2 (c1 int);
 create table t3 (c1 int);
@@ -14,9 +14,10 @@ create table t8 (c1 int);
 create table t9 (c1 int);
 create table t10 (c1 int);
 select Sum(ALL(COUNT_READ)) from performance_schema.file_summary_by_instance where FILE_NAME 
-like "%show_table_db/%.frm%" AND EVENT_NAME='wait/io/file/sql/FRM' into @count_read_before;
+like "%show_table_lw_db%" AND FILE_NAME like "%.frm%" AND EVENT_NAME='wait/io/file/sql/FRM'
+into @count_read_before;
 show tables;
-Tables_in_show_table_db
+Tables_in_show_table_lw_db
 t1
 t10
 t2
@@ -28,12 +29,13 @@ t7
 t8
 t9
 select Sum(ALL(COUNT_READ)) from performance_schema.file_summary_by_instance where FILE_NAME 
-like "%show_table_db/%.frm%" AND EVENT_NAME='wait/io/file/sql/FRM' into @count_read_after;
+like "%show_table_lw_db%" AND FILE_NAME like "%.frm%" AND EVENT_NAME='wait/io/file/sql/FRM'
+into @count_read_after;
 select @count_read_after-@count_read_before;
 @count_read_after-@count_read_before
-0.000000000000000000000000000000
+10.000000000000000000000000000000
 show full tables;
-Tables_in_show_table_db	Table_type
+Tables_in_show_table_lw_db	Table_type
 t1	BASE TABLE
 t10	BASE TABLE
 t2	BASE TABLE
@@ -45,9 +47,10 @@ t7	BASE TABLE
 t8	BASE TABLE
 t9	BASE TABLE
 select Sum(ALL(COUNT_READ)) from performance_schema.file_summary_by_instance where FILE_NAME 
-like "%show_table_db/%.frm%" AND EVENT_NAME='wait/io/file/sql/FRM' into @count_read_after;
+like "%show_table_lw_db%" AND FILE_NAME like "%.frm%" AND EVENT_NAME='wait/io/file/sql/FRM'
+into @count_read_after;
 select @count_read_after-@count_read_before;
 @count_read_after-@count_read_before
-10.000000000000000000000000000000
+20.000000000000000000000000000000
 drop table t1;
-drop database show_table_db;
+drop database show_table_lw_db;

=== modified file 'mysql-test/t/bug12427262.test'
--- a/mysql-test/t/bug12427262.test	2012-04-19 10:29:46 +0000
+++ b/mysql-test/t/bug12427262.test	2012-04-20 23:53:09 +0000
@@ -6,8 +6,8 @@
 --source include/have_perfschema.inc
 
 --disable_warnings
-create database show_table_db;
-use show_table_db;
+create database show_table_lw_db;
+use show_table_lw_db;
 create table t1 (c1 int);
 create table t2 (c1 int);
 create table t3 (c1 int);
@@ -22,14 +22,16 @@ create table t10 (c1 int);
 
 # Query PS to know initial read count for frm file.
 select Sum(ALL(COUNT_READ)) from performance_schema.file_summary_by_instance where FILE_NAME 
-like "%show_table_db/%.frm%" AND EVENT_NAME='wait/io/file/sql/FRM' into @count_read_before;
+like "%show_table_lw_db%" AND FILE_NAME like "%.frm%" AND EVENT_NAME='wait/io/file/sql/FRM'
+into @count_read_before;
 
 show tables;
 
 # Query PS to know read count for frm file after above query. It should
 # not be changed as FRM file will not be opened for above query.
 select Sum(ALL(COUNT_READ)) from performance_schema.file_summary_by_instance where FILE_NAME 
-like "%show_table_db/%.frm%" AND EVENT_NAME='wait/io/file/sql/FRM' into @count_read_after;
+like "%show_table_lw_db%" AND FILE_NAME like "%.frm%" AND EVENT_NAME='wait/io/file/sql/FRM'
+into @count_read_after;
 
 select @count_read_after-@count_read_before;
 
@@ -38,11 +40,12 @@ show full tables;
 # Query PS to know read count for frm file after above query. COUNT_READ
 # will be incremented by 1 as FRM file will be opened for above query.
 select Sum(ALL(COUNT_READ)) from performance_schema.file_summary_by_instance where FILE_NAME 
-like "%show_table_db/%.frm%" AND EVENT_NAME='wait/io/file/sql/FRM' into @count_read_after;
+like "%show_table_lw_db%" AND FILE_NAME like "%.frm%" AND EVENT_NAME='wait/io/file/sql/FRM'
+into @count_read_after;
 
 select @count_read_after-@count_read_before;
 
 --disable_warnings
 drop table t1;
-drop database show_table_db;
+drop database show_table_lw_db;
 --enable_warnings

No bundle (reason: useless for push emails).