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

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
This commit is contained in:
unknown
2004-03-18 00:09:13 +02:00
parent 219bbd5232
commit 022c5241a9
14 changed files with 289 additions and 315 deletions

View File

@ -263,11 +263,11 @@ a b
3 4
drop table t1;
create table `t1 `(a int);
Incorrect table name 't1 '
ERROR 42000: Incorrect table name 't1 '
create database `db1 `;
Incorrect database name 'db1 '
ERROR 42000: Incorrect database name 'db1 '
create table t1(`a ` int);
Incorrect column name 'a '
ERROR 42000: Incorrect column name 'a '
create table t1 (a int, key(a));
create table t2 (b int, foreign key(b) references t1(a), key(b));
drop table if exists t1,t2;