diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2003-10-15 14:51:56 +0500 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2003-10-15 14:51:56 +0500 |
| commit | f6fd834132924538657c30115e9aef82526456da (patch) | |
| tree | 057c1b5624b46363200dda2e2adcf12fb8658463 /mysql-test | |
| parent | 9456073f90354e82c8b31335bac1d486c88f2f4a (diff) | |
| parent | 547b056d6d6b6b351663612f8c7b4949788f33b4 (diff) | |
| download | mariadb-git-f6fd834132924538657c30115e9aef82526456da.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.max
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/sql_mode.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/sql_mode.test | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/sql_mode.result b/mysql-test/r/sql_mode.result index 9b80b965d10..06451b8ac34 100644 --- a/mysql-test/r/sql_mode.result +++ b/mysql-test/r/sql_mode.result @@ -71,10 +71,10 @@ t1 CREATE TABLE `t1` ( PRIMARY KEY (`a`), UNIQUE KEY `email` (`email`) ) TYPE=HEAP ROW_FORMAT=DYNAMIC -set sql_mode="postgresql,oracle,mssql,db2,sapdb"; +set sql_mode="postgresql,oracle,mssql,db2,maxdb"; select @@sql_mode; @@sql_mode -PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,POSTGRESQL,ORACLE,MSSQL,DB2,SAPDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS +PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,POSTGRESQL,ORACLE,MSSQL,DB2,MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS show create table t1; Table Create Table t1 CREATE TABLE "t1" ( diff --git a/mysql-test/t/sql_mode.test b/mysql-test/t/sql_mode.test index d3531f0c440..d96fd030207 100644 --- a/mysql-test/t/sql_mode.test +++ b/mysql-test/t/sql_mode.test @@ -24,7 +24,7 @@ show create table t1; set @@sql_mode="no_field_options,mysql323,mysql40"; show variables like 'sql_mode'; show create table t1; -set sql_mode="postgresql,oracle,mssql,db2,sapdb"; +set sql_mode="postgresql,oracle,mssql,db2,maxdb"; select @@sql_mode; show create table t1; drop table t1; |