bzr push into mysql-next-mr branch (marc.alff:3149 to 3150)

[Marc Alff]

 3150 Marc Alff	2010-06-03
      Fixed the main.information_schema test case to be more reliable,
      and insensitive to build with / without the performance schema.

    modified:
      mysql-test/r/information_schema.result
      mysql-test/t/information_schema.test
 3149 Marc Alff	2010-06-02 [merge]
      merge mysql-next-mr --> mysql-next-mr-wl4674

    added:
      mysql-test/include/mysqlbinlog_raw_mode.inc
      mysql-test/r/mysqlbinlog_raw_mode.result
      mysql-test/r/mysqlbinlog_raw_mode_win.result
      mysql-test/t/mysqlbinlog_raw_mode.test
      mysql-test/t/mysqlbinlog_raw_mode_win.test
    modified:
      client/Makefile.am
      client/client_priv.h
      client/mysqlbinlog.cc
=== modified file 'mysql-test/r/information_schema.result'
--- a/mysql-test/r/information_schema.result	2010-05-20 08:54:19 +0000
+++ b/mysql-test/r/information_schema.result	2010-06-03 15:09:17 +0000
@@ -770,9 +770,9 @@ count(*)
 68
 drop view a2, a1;
 drop table t_crashme;
-select table_schema,table_name, column_name from
-information_schema.columns
-where data_type = 'longtext';
+select table_schema, table_name, column_name from information_schema.columns
+where table_schema not like 'performance_schema'
+  and data_type = 'longtext';
 table_schema	table_name	column_name
 information_schema	COLUMNS	COLUMN_DEFAULT
 information_schema	COLUMNS	COLUMN_TYPE
@@ -790,7 +790,9 @@ information_schema	TRIGGERS	ACTION_CONDI
 information_schema	TRIGGERS	ACTION_STATEMENT
 information_schema	VIEWS	VIEW_DEFINITION
 select table_name, column_name, data_type from information_schema.columns
-where data_type = 'datetime' and table_name not like 'innodb_%';
+where table_schema not like 'performance_schema'
+  and data_type = 'datetime'
+  and table_name not like 'innodb_%';
 table_name	column_name	data_type
 EVENTS	EXECUTE_AT	datetime
 EVENTS	STARTS	datetime

=== modified file 'mysql-test/t/information_schema.test'
--- a/mysql-test/t/information_schema.test	2010-05-20 08:54:19 +0000
+++ b/mysql-test/t/information_schema.test	2010-06-03 15:09:17 +0000
@@ -486,11 +486,14 @@ drop table t_crashme;
 # Bug#7215 information_schema: columns are longtext instead of varchar
 # Bug#7217 information_schema: columns are varbinary() instead of timestamp
 #
-select table_schema,table_name, column_name from
-information_schema.columns
-where data_type = 'longtext';
+select table_schema, table_name, column_name from information_schema.columns
+where table_schema not like 'performance_schema'
+  and data_type = 'longtext';
+
 select table_name, column_name, data_type from information_schema.columns
-where data_type = 'datetime' and table_name not like 'innodb_%';
+where table_schema not like 'performance_schema'
+  and data_type = 'datetime'
+  and table_name not like 'innodb_%';
 
 #
 # Bug#8164 subquery with INFORMATION_SCHEMA.COLUMNS, 100 % CPU


Attachment: [text/bzr-bundle] bzr/[e-mail]