bzr push into mysql-trunk branch (vasil.dimov:3299 to 3300) Bug#12783900

[vasil.dimov]

 3300 Vasil Dimov	2011-07-25
      Fix Bug#12783900 INNODB_BUFFER_POOL_FILENAME IS SOMETIMES NOT POPULATED
      BY THE EXPECTED TIME
      
      The bug in the test was that the dump status from the previous dump would
      remain and would satisfy the condition that is expected to wait for the
      second dump to complete. Thus the flow continued without the second dump
      completing and the second --file_exists failed.

    modified:
      mysql-test/suite/sys_vars/r/innodb_buffer_pool_filename_basic.result
      mysql-test/suite/sys_vars/t/innodb_buffer_pool_filename_basic.test
 3299 Marc Alff	2011-07-25
      Improved test robustness

    modified:
      mysql-test/suite/perfschema/t/stage_mdl_function.test
      mysql-test/suite/perfschema/t/stage_mdl_global.test
      mysql-test/suite/perfschema/t/stage_mdl_procedure.test
      mysql-test/suite/perfschema/t/stage_mdl_table.test
=== modified file 'mysql-test/suite/sys_vars/r/innodb_buffer_pool_filename_basic.result'
--- a/mysql-test/suite/sys_vars/r/innodb_buffer_pool_filename_basic.result	revid:marc.alff@stripped
+++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_filename_basic.result	revid:vasil.dimov@stripped
@@ -3,6 +3,7 @@ SELECT @orig;
 @orig
 ib_buffer_pool
 SET GLOBAL innodb_buffer_pool_dump_now = ON;
+SET @orig = @@global.innodb_buffer_pool_filename;
 SET GLOBAL innodb_buffer_pool_filename = 'innodb_foobar_dump';
 SET GLOBAL innodb_buffer_pool_dump_now = ON;
 SET GLOBAL innodb_buffer_pool_filename = @orig;

=== modified file 'mysql-test/suite/sys_vars/t/innodb_buffer_pool_filename_basic.test'
--- a/mysql-test/suite/sys_vars/t/innodb_buffer_pool_filename_basic.test	revid:marc.alff@stripped
+++ b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_filename_basic.test	revid:vasil.dimov@stripped
@@ -4,7 +4,7 @@
 
 -- source include/have_innodb.inc
 
-# Check the default value and save for later restoration
+# Check the default value
 SET @orig = @@global.innodb_buffer_pool_filename;
 SELECT @orig;
 
@@ -24,6 +24,15 @@ let $wait_condition =
 
 # Try with a non-default filename
 
+# Restart the server so that the status gets reset to something other than
+# 'Buffer pool(s) dump completed at ', otherwise the following wait_condition
+# gets satisfied before the following dump has completed and --file_exists
+# fails
+-- source include/restart_mysqld.inc
+
+# Save for later restoration
+SET @orig = @@global.innodb_buffer_pool_filename;
+
 SET GLOBAL innodb_buffer_pool_filename = 'innodb_foobar_dump';
 
 SET GLOBAL innodb_buffer_pool_dump_now = ON;

No bundle (reason: useless for push emails).