diff options
| author | unknown <bar@mysql.com> | 2005-10-21 16:53:50 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-10-21 16:53:50 +0500 |
| commit | eddba2ea387a07839515ad29929a0699973624a4 (patch) | |
| tree | 2c5b130b3ccc7b89ebaad3c7288d75f1792c6fc1 /mysql-test/r/show_check.result | |
| parent | 08ed63ed32102c80c6be5cdb47f9ccd4b39d15a9 (diff) | |
| parent | c9978d8bcbf609d5e495df77f7306cdb5abaf7a1 (diff) | |
| download | mariadb-git-eddba2ea387a07839515ad29929a0699973624a4.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-5.0.b12371
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/ctype_utf8.result:
After merge fix.
mysql-test/r/show_check.result:
After merge fix.
sql/item_strfunc.h:
After merge fix.
tests/mysql_client_test.c:
After merge fix.
Diffstat (limited to 'mysql-test/r/show_check.result')
| -rw-r--r-- | mysql-test/r/show_check.result | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index c143c7f0f29..20f695d9ac0 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -557,3 +557,10 @@ DROP TABLE tyt2; DROP TABLE urkunde; SHOW TABLES FROM non_existing_database; ERROR 42000: Unknown database 'non_existing_database' +flush tables; +SHOW TABLE STATUS like 't1'; +Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment +t1 NULL NULL NULL NULL # # # # NULL NULL NULL NULL NULL NULL NULL NULL Incorrect information in file: './test/t1.frm' +show create table t1; +ERROR HY000: Incorrect information in file: './test/t1.frm' +drop table t1; |