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

[Sergey Vojtovich]

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

    modified:
      mysql-test/suite/innodb/r/innodb-wl5980-discard.result
 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
=== modified file 'mysql-test/suite/innodb/r/innodb-wl5980-discard.result'
--- a/mysql-test/suite/innodb/r/innodb-wl5980-discard.result	2012-06-22 10:10:42 +0000
+++ b/mysql-test/suite/innodb/r/innodb-wl5980-discard.result	2012-06-25 08:09:16 +0000
@@ -218,13 +218,8 @@ FROM information_schema.innodb_sys_table
 name	n_cols	file_format	row_format
 test/t5980	6	Antelope	Compact
 SELECT name,file_format,row_format
-FROM information_schema.innodb_sys_tablespaces;
+FROM information_schema.innodb_sys_tablespaces WHERE name LIKE 'test%';
 name	file_format	row_format
-mysql/innodb_table_stats	Antelope	Compact or Redundant
-mysql/innodb_index_stats	Antelope	Compact or Redundant
-mysql/slave_relay_log_info	Antelope	Compact or Redundant
-mysql/slave_master_info	Antelope	Compact or Redundant
-mysql/slave_worker_info	Antelope	Compact or Redundant
 test/t5980	Antelope	Compact or Redundant
 SELECT path FROM information_schema.innodb_sys_datafiles
 WHERE path LIKE '%test%' ORDER BY space;
@@ -238,13 +233,8 @@ SELECT name,n_cols,file_format,row_forma
 FROM information_schema.innodb_sys_tables WHERE name LIKE 'test%';
 name	n_cols	file_format	row_format
 SELECT name,file_format,row_format
-FROM information_schema.innodb_sys_tablespaces;
+FROM information_schema.innodb_sys_tablespaces WHERE name LIKE 'test%';
 name	file_format	row_format
-mysql/innodb_table_stats	Antelope	Compact or Redundant
-mysql/innodb_index_stats	Antelope	Compact or Redundant
-mysql/slave_relay_log_info	Antelope	Compact or Redundant
-mysql/slave_master_info	Antelope	Compact or Redundant
-mysql/slave_worker_info	Antelope	Compact or Redundant
 SELECT path FROM information_schema.innodb_sys_datafiles
 WHERE path LIKE '%test%' ORDER BY space;
 path
@@ -460,13 +450,8 @@ FROM information_schema.innodb_sys_table
 name	n_cols	file_format	row_format
 test/t5980	5	Antelope	Compact
 SELECT name,file_format,row_format
-FROM information_schema.innodb_sys_tablespaces;
+FROM information_schema.innodb_sys_tablespaces WHERE name LIKE 'test%';
 name	file_format	row_format
-mysql/innodb_table_stats	Antelope	Compact or Redundant
-mysql/innodb_index_stats	Antelope	Compact or Redundant
-mysql/slave_relay_log_info	Antelope	Compact or Redundant
-mysql/slave_master_info	Antelope	Compact or Redundant
-mysql/slave_worker_info	Antelope	Compact or Redundant
 test/t5980	Antelope	Compact or Redundant
 SELECT path FROM information_schema.innodb_sys_datafiles
 WHERE path LIKE '%test%' ORDER BY space;

No bundle (reason: useless for push emails).