bzr push into mysql-trunk branch (sergey.vojtovich:3900 to 3901) WL#6216

[Sergey Vojtovich]

 3901 Sergey Vojtovich	2012-06-25
      Fixed innodb-wl5980-discard failure detected after push of WL#6216.

    modified:
      mysql-test/suite/innodb/t/innodb-wl5980-discard.test
 3900 Sergey Vojtovich	2012-06-25
      Fixed innodb-restart failure detected after push of WL#6216.

    modified:
      mysql-test/suite/innodb/r/innodb-restart.result
      mysql-test/suite/innodb/t/innodb-restart.test
=== modified file 'mysql-test/suite/innodb/t/innodb-wl5980-discard.test'
--- a/mysql-test/suite/innodb/t/innodb-wl5980-discard.test	2012-06-22 10:10:42 +0000
+++ b/mysql-test/suite/innodb/t/innodb-wl5980-discard.test	2012-06-25 08:05:05 +0000
@@ -181,7 +181,7 @@ SELECT * FROM t5980;
 SELECT name,n_cols,file_format,row_format
        FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%';
 SELECT name,file_format,row_format
-       FROM information_schema.innodb_sys_tablespaces;
+       FROM information_schema.innodb_sys_tablespaces WHERE name LIKE 'test%';
 --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
 SELECT path FROM information_schema.innodb_sys_datafiles
        WHERE path LIKE '%test%' ORDER BY space;
@@ -193,7 +193,7 @@ DROP TABLE t5980;
 SELECT name,n_cols,file_format,row_format
        FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%';
 SELECT name,file_format,row_format
-       FROM information_schema.innodb_sys_tablespaces;
+       FROM information_schema.innodb_sys_tablespaces WHERE name LIKE 'test%';
 SELECT path FROM information_schema.innodb_sys_datafiles
 	WHERE path LIKE '%test%' ORDER BY space;
 --echo ### files in MYSQL_DATA_DIR/test
@@ -353,7 +353,7 @@ SHOW CREATE TABLE t5980;
 SELECT name,n_cols,file_format,row_format
        FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%';
 SELECT name,file_format,row_format
-       FROM information_schema.innodb_sys_tablespaces;
+       FROM information_schema.innodb_sys_tablespaces WHERE name LIKE 'test%';
 --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
 SELECT path FROM information_schema.innodb_sys_datafiles
 	WHERE path LIKE '%test%' ORDER BY space;

No bundle (reason: useless for push emails).