1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

Merge for update

mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
include/mysqld_error.h:
  Merge for updates
mysql-test/r/rpl_change_master.result:
  Merge for updates
sql/share/czech/errmsg.txt:
  Merge for updates
sql/share/danish/errmsg.txt:
  Merge for updates
sql/share/dutch/errmsg.txt:
  Merge for updates
sql/share/english/errmsg.txt:
  Merge for updates
sql/share/estonian/errmsg.txt:
  Merge for updates
sql/share/french/errmsg.txt:
  Merge for updates
sql/share/german/errmsg.txt:
  Merge for updates
sql/share/greek/errmsg.txt:
  Merge for updates
sql/share/hungarian/errmsg.txt:
  Merge for updates
sql/share/italian/errmsg.txt:
  Merge for updates
sql/share/japanese/errmsg.txt:
  Merge for updates
sql/share/korean/errmsg.txt:
  Merge for updates
sql/share/norwegian-ny/errmsg.txt:
  Merge for updates
sql/share/norwegian/errmsg.txt:
  Merge for updates
sql/share/polish/errmsg.txt:
  Merge for updates
sql/share/portuguese/errmsg.txt:
  Merge for updates
sql/share/romanian/errmsg.txt:
  Merge for updates
sql/share/russian/errmsg.txt:
  Merge for updates
sql/share/serbian/errmsg.txt:
  Merge for updates
sql/share/slovak/errmsg.txt:
  Merge for updates
sql/share/spanish/errmsg.txt:
  Merge for updates
sql/share/swedish/errmsg.txt:
  Merge for updates
sql/share/ukrainian/errmsg.txt:
  Merge for updates
This commit is contained in:
unknown
2003-12-02 20:57:34 +00:00
41 changed files with 207 additions and 87 deletions

View File

@@ -157,7 +157,7 @@ SELECT @@table_type;
CREATE TABLE t1 (a int not null);
show create table t1;
drop table t1;
# Test what happens when using a non existing table type
--error 1284
SET SESSION table_type="gemini";
SELECT @@table_type;
CREATE TABLE t1 (a int not null);
@@ -277,7 +277,7 @@ SELECT @@table_type;
CREATE TABLE t1 (a int not null);
show create table t1;
drop table t1;
# Test what happens when using a non existing table type
--error 1284
SET SESSION table_type="gemini";
SELECT @@table_type;
CREATE TABLE t1 (a int not null);