From d3deb635ddc1bd2953ce8740e693dfb9d17d800f Mon Sep 17 00:00:00 2001
From: marko <Unknown>
Date: Tue, 7 Oct 2008 10:28:45 +0000
Subject: [PATCH] branches/zip: mysql-test/patches/information_schema.diff: Add
 patches to other mysql-test results that fail because of the added
 INFORMATION_SCHEMA tables: information_schema_db.result, mysqlshow.result.

---
 mysql-test/patches/information_schema.diff | 61 +++++++++++++++++++---
 1 file changed, 55 insertions(+), 6 deletions(-)

diff --git a/mysql-test/patches/information_schema.diff b/mysql-test/patches/information_schema.diff
index 1da424d73d2..31237197a45 100644
--- a/mysql-test/patches/information_schema.diff
+++ b/mysql-test/patches/information_schema.diff
@@ -1,6 +1,7 @@
+diff mysql-test/r/information_schema.result.orig mysql-test/r/information_schema.result
 --- mysql-test/r/information_schema.result.orig	2008-08-04 09:27:49.000000000 +0300
 +++ mysql-test/r/information_schema.result	2008-10-07 11:21:51.000000000 +0300
-@@ -64,6 +64,13 @@ TABLE_PRIVILEGES
+@@ -64,6 +64,13 @@
  TRIGGERS
  USER_PRIVILEGES
  VIEWS
@@ -14,7 +15,7 @@
  columns_priv
  db
  event
-@@ -795,6 +802,8 @@ TABLES	CREATE_TIME	datetime
+@@ -795,6 +802,8 @@
  TABLES	UPDATE_TIME	datetime
  TABLES	CHECK_TIME	datetime
  TRIGGERS	CREATED	datetime
@@ -23,7 +24,7 @@
  event	execute_at	datetime
  event	last_executed	datetime
  event	starts	datetime
-@@ -848,7 +857,7 @@ delete from mysql.db where user='mysqlte
+@@ -848,7 +857,7 @@
  flush privileges;
  SELECT table_schema, count(*) FROM information_schema.TABLES where table_name<>'ndb_binlog_index' AND table_name<>'ndb_apply_status' GROUP BY TABLE_SCHEMA;
  table_schema	count(*)
@@ -32,7 +33,7 @@
  mysql	22
  create table t1 (i int, j int);
  create trigger trg1 before insert on t1 for each row
-@@ -1263,6 +1272,13 @@ TABLE_PRIVILEGES	TABLE_SCHEMA
+@@ -1263,6 +1272,13 @@
  TRIGGERS	TRIGGER_SCHEMA
  USER_PRIVILEGES	GRANTEE
  VIEWS	TABLE_SCHEMA
@@ -46,7 +47,7 @@
  SELECT t.table_name, c1.column_name
  FROM information_schema.tables t
  INNER JOIN
-@@ -1306,6 +1322,13 @@ TABLE_PRIVILEGES	TABLE_SCHEMA
+@@ -1306,6 +1322,13 @@
  TRIGGERS	TRIGGER_SCHEMA
  USER_PRIVILEGES	GRANTEE
  VIEWS	TABLE_SCHEMA
@@ -60,7 +61,7 @@
  SELECT MAX(table_name) FROM information_schema.tables;
  MAX(table_name)
  VIEWS
-@@ -1382,6 +1405,13 @@ EVENTS	information_schema.EVENTS	1
+@@ -1382,6 +1405,13 @@
  FILES	information_schema.FILES	1
  GLOBAL_STATUS	information_schema.GLOBAL_STATUS	1
  GLOBAL_VARIABLES	information_schema.GLOBAL_VARIABLES	1
@@ -74,3 +75,51 @@
  KEY_COLUMN_USAGE	information_schema.KEY_COLUMN_USAGE	1
  PARTITIONS	information_schema.PARTITIONS	1
  PLUGINS	information_schema.PLUGINS	1
+diff mysql-test/r/information_schema_db.result.orig mysql-test/r/information_schema_db.result
+--- mysql-test/r/information_schema_db.result.orig	2008-08-04 09:27:49.000000000 +0300
++++ mysql-test/r/information_schema_db.result	2008-10-07 12:26:31.000000000 +0300
+@@ -33,6 +33,13 @@
+ TRIGGERS
+ USER_PRIVILEGES
+ VIEWS
++INNODB_CMP_RESET
++INNODB_TRX
++INNODB_CMPMEM_RESET
++INNODB_LOCK_WAITS
++INNODB_CMPMEM
++INNODB_CMP
++INNODB_LOCKS
+ show tables from INFORMATION_SCHEMA like 'T%';
+ Tables_in_information_schema (T%)
+ TABLES
+diff mysql-test/r/mysqlshow.result.orig mysql-test/r/mysqlshow.result
+--- mysql-test/r/mysqlshow.result.orig	2008-08-04 09:27:51.000000000 +0300
++++ mysql-test/r/mysqlshow.result	2008-10-07 12:35:39.000000000 +0300
+@@ -107,6 +107,13 @@
+ | TRIGGERS                              |
+ | USER_PRIVILEGES                       |
+ | VIEWS                                 |
++| INNODB_CMP_RESET                      |
++| INNODB_TRX                            |
++| INNODB_CMPMEM_RESET                   |
++| INNODB_LOCK_WAITS                     |
++| INNODB_CMPMEM                         |
++| INNODB_CMP                            |
++| INNODB_LOCKS                          |
+ +---------------------------------------+
+ Database: INFORMATION_SCHEMA
+ +---------------------------------------+
+@@ -140,6 +147,13 @@
+ | TRIGGERS                              |
+ | USER_PRIVILEGES                       |
+ | VIEWS                                 |
++| INNODB_CMP_RESET                      |
++| INNODB_TRX                            |
++| INNODB_CMPMEM_RESET                   |
++| INNODB_LOCK_WAITS                     |
++| INNODB_CMPMEM                         |
++| INNODB_CMP                            |
++| INNODB_LOCKS                          |
+ +---------------------------------------+
+ Wildcard: inf_rmation_schema
+ +--------------------+