diff options
| author | unknown <gluh@mysql.com> | 2005-05-24 15:35:24 +0500 |
|---|---|---|
| committer | unknown <gluh@mysql.com> | 2005-05-24 15:35:24 +0500 |
| commit | d0afc3492e6e8fd54c179430ca8ea0b56dabe658 (patch) | |
| tree | 1f4510051783fc709342b71acb3e19dde3dc94fc /mysql-test | |
| parent | ab1ba1341c3eed4375739ec166fc26fdbb9e3631 (diff) | |
| parent | f9433acc8180cd5f7edd7c419d79fd683f089061 (diff) | |
| download | mariadb-git-d0afc3492e6e8fd54c179430ca8ea0b56dabe658.tar.gz | |
Merge gluh@gluh:/home/gluh/release/mysql-5.0-build
into mysql.com:/home/gluh/MySQL/Merge/mysql-5.0
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/information_schema_db.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/information_schema_db.test | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/r/information_schema_db.result b/mysql-test/r/information_schema_db.result index 0ccb22be22a..3da5cc7bd11 100644 --- a/mysql-test/r/information_schema_db.result +++ b/mysql-test/r/information_schema_db.result @@ -1,6 +1,6 @@ use INFORMATION_SCHEMA; show tables; -Tables_in_INFORMATION_SCHEMA +Tables_in_information_schema SCHEMATA TABLES COLUMNS @@ -17,7 +17,7 @@ COLUMN_PRIVILEGES TABLE_CONSTRAINTS KEY_COLUMN_USAGE show tables from INFORMATION_SCHEMA like 'T%'; -Tables_in_INFORMATION_SCHEMA (T%) +Tables_in_information_schema (T%) TABLES TABLE_PRIVILEGES TABLE_CONSTRAINTS diff --git a/mysql-test/t/information_schema_db.test b/mysql-test/t/information_schema_db.test index f88d04c2783..efb738d682c 100644 --- a/mysql-test/t/information_schema_db.test +++ b/mysql-test/t/information_schema_db.test @@ -1,7 +1,9 @@ -- source include/testdb_only.inc use INFORMATION_SCHEMA; +--replace_result Tables_in_INFORMATION_SCHEMA Tables_in_information_schema show tables; +--replace_result 'Tables_in_INFORMATION_SCHEMA (T%)' 'Tables_in_information_schema (T%)' show tables from INFORMATION_SCHEMA like 'T%'; create database `inf%`; use `inf%`; |