diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2004-12-14 15:20:46 +0300 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2004-12-14 15:20:46 +0300 |
| commit | 0d9ac947b07277aa909142a706a06b249cd97adc (patch) | |
| tree | 7a5d2e46c76ec11fda81af82b2e6d32d0d41426b /mysql-test | |
| parent | b603cbc3ba0e25d7e1fc27e796a8956551f40f55 (diff) | |
| download | mariadb-git-0d9ac947b07277aa909142a706a06b249cd97adc.tar.gz | |
Fx for bug#7221: information_schema: errors in "key_column_usage"
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/information_schema.result | 12 | ||||
| -rw-r--r-- | mysql-test/r/information_schema_inno.result | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index 1237bae9d71..d2099ed4b22 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -390,11 +390,11 @@ NULL test key_1 test t1 UNIQUE NULL test key_2 test t1 UNIQUE select * from information_schema.KEY_COLUMN_USAGE where TABLE_SCHEMA= "test"; -CONSTRAINT_CATALOG CONSTRAINT_SCHEMA CONSTRAINT_NAME TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION POSITION_IN_UNIQUE_CONSTRAINT REFERENCED_TABLE_SCHEMA REFERENCED_TABLE_NAME REFERENCED_COLUMN_NAME -NULL test PRIMARY NULL test t1 a 1 NULL NULL NULL NULL -NULL test constraint_1 NULL test t1 a 1 NULL NULL NULL NULL -NULL test key_1 NULL test t1 a 1 NULL NULL NULL NULL -NULL test key_2 NULL test t1 a 1 NULL NULL NULL NULL +CONSTRAINT_CATALOG CONSTRAINT_SCHEMA CONSTRAINT_NAME TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION POSITION_IN_UNIQUE_CONSTRAINT +NULL test PRIMARY NULL test t1 a 1 NULL +NULL test constraint_1 NULL test t1 a 1 NULL +NULL test key_1 NULL test t1 a 1 NULL +NULL test key_2 NULL test t1 a 1 NULL select table_name from information_schema.TABLES where table_schema like "test%"; table_name t1 @@ -559,7 +559,7 @@ TABLE_NAME= "vo"; CONSTRAINT_CATALOG CONSTRAINT_SCHEMA CONSTRAINT_NAME TABLE_SCHEMA TABLE_NAME CONSTRAINT_TYPE select * from information_schema.KEY_COLUMN_USAGE where TABLE_NAME= "vo"; -CONSTRAINT_CATALOG CONSTRAINT_SCHEMA CONSTRAINT_NAME TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION POSITION_IN_UNIQUE_CONSTRAINT REFERENCED_TABLE_SCHEMA REFERENCED_TABLE_NAME REFERENCED_COLUMN_NAME +CONSTRAINT_CATALOG CONSTRAINT_SCHEMA CONSTRAINT_NAME TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION POSITION_IN_UNIQUE_CONSTRAINT drop view vo; select TABLE_NAME,TABLE_TYPE,ENGINE from information_schema.tables diff --git a/mysql-test/r/information_schema_inno.result b/mysql-test/r/information_schema_inno.result index cdbdda5fd43..4784c5e6106 100644 --- a/mysql-test/r/information_schema_inno.result +++ b/mysql-test/r/information_schema_inno.result @@ -11,9 +11,9 @@ NULL test t2_ibfk_1 test t2 FOREIGN KEY NULL test t2_ibfk_2 test t2 FOREIGN KEY select * from information_schema.KEY_COLUMN_USAGE where TABLE_SCHEMA= "test"; -CONSTRAINT_CATALOG CONSTRAINT_SCHEMA CONSTRAINT_NAME TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION POSITION_IN_UNIQUE_CONSTRAINT REFERENCED_TABLE_SCHEMA REFERENCED_TABLE_NAME REFERENCED_COLUMN_NAME -NULL test PRIMARY NULL test t1 id 1 NULL NULL NULL NULL -NULL test PRIMARY NULL test t2 id 1 NULL NULL NULL NULL -NULL test t2_ibfk_1 NULL test t2 t1_id 1 1 test t1 id -NULL test t2_ibfk_2 NULL test t2 t1_id 1 1 test t1 id +CONSTRAINT_CATALOG CONSTRAINT_SCHEMA CONSTRAINT_NAME TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION POSITION_IN_UNIQUE_CONSTRAINT +NULL test PRIMARY NULL test t1 id 1 NULL +NULL test PRIMARY NULL test t2 id 1 NULL +NULL test t2_ibfk_1 NULL test t2 t1_id 1 1 +NULL test t2_ibfk_2 NULL test t2 t1_id 1 1 drop table t2, t1; |