diff options
author | unknown <monty@mysql.com> | 2004-03-18 00:09:13 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-03-18 00:09:13 +0200 |
commit | 022c5241a9ebcd6047b761ef437f51e62722f9e9 (patch) | |
tree | 93869dd2e083920baaab586bbd65e0b77b42fcfa /mysql-test/t/show_check.test | |
parent | 219bbd5232d6ff958f97b30abbc0cb9646abf6a8 (diff) | |
download | mariadb-git-022c5241a9ebcd6047b761ef437f51e62722f9e9.tar.gz |
after merge fixes
include/my_tree.h:
After merge fixes
mysql-test/r/create.result:
After merge fixes
mysql-test/r/insert.result:
After merge fixes
mysql-test/r/multi_update.result:
After merge fixes
mysql-test/r/query_cache.result:
After merge fixes
mysql-test/r/rpl_error_ignored_table.result:
After merge fixes
mysql-test/r/rpl_optimize.result:
After merge fixes
mysql-test/r/show_check.result:
After merge fixes
mysql-test/t/insert.test:
After merge fixes (Remove columns with space last)
mysql-test/t/multi_update.test:
After merge fixes
mysql-test/t/show_check.test:
After merge fixes
sql/field.cc:
Remove compiler warnings
sql/sql_base.cc:
Fix bug when table was refreshed
Diffstat (limited to 'mysql-test/t/show_check.test')
-rw-r--r-- | mysql-test/t/show_check.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test index 35149edaa7d..638626a7456 100644 --- a/mysql-test/t/show_check.test +++ b/mysql-test/t/show_check.test @@ -54,8 +54,8 @@ create table t1 ( test_set set( 'val1', 'val2', 'val3' ) not null default '', name char(20) default 'O''Brien' comment 'O''Brien as default', c int not null comment 'int column', - `c-b` int comment 'name with a space', - `space ` int comment 'name with a space', + `c-b` int comment 'name with a minus', + `space 2` int comment 'name with a space', ) comment = 'it\'s a table' ; show create table t1; set sql_quote_show_create=0; |