From: Marc Alff
Date: June 3 2010 3:09pm
Subject: bzr commit into mysql-next-mr branch (marc.alff:3150)
List-Archive: http://lists.mysql.com/commits/110135
Message-Id: <201006031510.o53FASNS020287@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7702063988820453590=="

--===============7702063988820453590==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/malff/BZR_TREE/mysql-next-mr-wl4674/ based on revid:marc.alff@stripped

 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
=== 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


--===============7702063988820453590==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marc.alff@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-wl4674/
# testament_sha1: 4c6eb7149b51e472eaa1f9dc8a1f9a8bc89ee9d0
# timestamp: 2010-06-03 09:09:28 -0600
# source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr/
# base_revision_id: marc.alff@stripped\
#   pez5e5cip3wldtgj
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYhoXGkAAkdfgEAQUuf//3MC
AAC////wUAWPUGSo9nSqFADqElCZQJ6Ghk9EIegR5Ro9QPUGglCU8mo8CNJBomTTRkYgGIwMBoAA
BoAAAAAA01RMJ6mmJoNMmQZBkADEYEkmkAJgmECaaGTSaajEaPUZwjqNg9zWF2stu0T1ZxNUGaI6
pUlEdBzoOw5owwUsXyOLmfQYYKb9T2KRhmTMY/Cu/Mk/jdB3JVazkWdIxo1g3pKGTcKkyUHQIF38
0d8DICcaRhcF7hxk0hQQCUlkCR4kPXjnprMY4beQ/nwQ7IPuXBaUdmbVItipDaSmSFxqA9iODcA4
kND+88lw8jYWxs1BOWF4Kcg4sVB4kpRIhcwbeEEJl45wQnxIqEYAOWCiGMEiEqgOBOHCMixlrtUh
GMlOA9ilYMuVakQveSwGzK9ZgsB4zTz8qricKkuflQUf5S2gXWRGAGPrzZm8qVKHHqwQDkk33CZd
kEsnzkM6ORHWehV5G+ygPQ4DHlQ9AKgOTY7MlhBm1wsQ1oEdS6MsqnYhRbCQxopPkD/ZNF0K8yxF
aoBiQdWFREgMcJzwZSkTYsJOW33JNhfBGtdiq8pQDfmXTp4G3nQwDyAShMc6sFr63T9LM/8jyJ5i
2vCxIhYZ6ZEw5fk5tKztVp56ahbOUF0XrPkNPY5FAZjRoF7kowMK80RosQoFOHSUdylrC7/hGe9D
nMzYcTbjS0r0IlTUZ5ueswFnZsT1qO0HzpthYzuacmYuRiWaDPlbRYPC7kyGBcmAsUYQMtHyB4SF
BG4okigQIH+w5wgJcFYsJKEn/oZHEr2EUoDBD093CLCYCKOIWAjibtCcWh5lJVwzKBqw6wOPlER2
7gqKWgi7qCmxAnih8QiwtKOsAUqUzTOJgjjzqnLOXhuamxKzMUymMekwoHSOb7UGW9gXuWHqXGRA
ewvKYm9HthDjYCNFe7ApzkAYTkZCcHZN7dyGmVc0wODSDkcTPwMoWHuX5qCtYscywegng43njU0b
27WBPa8mYYSs5/x0y7xaPNdDza49is49ShobClDAYAxSaYVyD7ZJh9enQySvJzy72dl7SkqmBDWq
pMDjrogG1HrOoeO+UGogMhi9kbyVSa6hkMYlwFxIC5DLRuCFatKz5OB2PMtx2oieroMxx/PrKyGL
TVdzL7aAVm0zmbxyGuFEtcEfAOrigr+5kl0lORsxJ7C/+kNNyUwvHMUQ11vRbrEpPww3wP8+G6e9
FaClRRwKh8YOOshPdIWGFUGINtpKchWbDcjvN91tIWui7nEKpEx9bAUAgIifroC5j8hPvv+xzKwH
uLdSUOG53AKwRX6I8F+TyTEOkQV4ZDBGByPD4OpZiFlFC077T6ARiddjU0jwCwZB5CrK0KREZ4CI
Go7ncvJhUEc0mYGV+u4nMmOYQGSUol6ZET9ApkVUID6uqRQL79yoPQDaUwFsWGrDBFdgfoFWiqLK
zdS3YwMJrUx0v+hfx4K5AdpUKDhi6U1vWKkQTzICzYPhkYE034GW4kKLue2mpIsYCq+0quVIy0mK
jciVzTYd2NAOx2ZmxVwrEN4EOYFhhlmLobpY/c4mO1/SlyWIM4bxEP5I5RopJjIiD5q5y4hLDptM
SKCSSU2IsmF2qEHGDAcwECnb1XOqbAqW1L4FLXTjAn65IlOzAVAeJ0DQcqI3r1AqeckpA2jDXGQo
ROs4kgmIpJ2nuLuSKcKEhENC40g=


--===============7702063988820453590==--