database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/home/jimw/my/mysql-5.0-11711

Browse Source 
into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/information_schema.result:
  Resolve conflicts
This commit is contained in:
unknown
2005-08-19 11:40:39 -07:00
parent 141a36c31b 42002d5dee
commit 0f556e8ff3
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/r/information_schema.result
View File

@ -585,8 +585,8 @@ select TABLE_NAME,TABLE_TYPE,ENGINE
from information_schema.tables
where table_schema='information_schema' limit 2;
TABLE_NAME TABLE_TYPE ENGINE
CHARACTER_SETS TEMPORARY MEMORY
COLLATIONS TEMPORARY MEMORY
CHARACTER_SETS SYSTEM VIEW MEMORY
COLLATIONS SYSTEM VIEW MEMORY
show tables from information_schema like "T%";
Tables_in_information_schema (T%)
TABLES
@ -598,10 +598,10 @@ ERROR HY000: Can't create database 'information_schema'; database exists
use information_schema;
show full tables like "T%";
Tables_in_information_schema (T%) Table_type
TABLES TEMPORARY
TABLE_CONSTRAINTS TEMPORARY
TABLE_PRIVILEGES TEMPORARY
TRIGGERS TEMPORARY
TABLES SYSTEM VIEW
TABLE_CONSTRAINTS SYSTEM VIEW
TABLE_PRIVILEGES SYSTEM VIEW
TRIGGERS SYSTEM VIEW
create table t1(a int);
ERROR 42S02: Unknown table 't1' in information_schema
use test;