diff options
author | unknown <gluh@mysql.com> | 2005-09-29 16:35:50 +0500 |
---|---|---|
committer | unknown <gluh@mysql.com> | 2005-09-29 16:35:50 +0500 |
commit | fc3efeb09f42dba15053d414ba82d1847ce71a88 (patch) | |
tree | 951ddf2136d74289a07380731612c68f33e873bb /mysql-test/t/sql_mode.test | |
parent | b65c76cb1bb7bd2fb5fd267ca7405be0205abb15 (diff) | |
parent | f3ad7320523e341efeadfa46ef88a224a80d6dfd (diff) | |
download | mariadb-git-fc3efeb09f42dba15053d414ba82d1847ce71a88.tar.gz |
4.1 -> 5.0 merge
mysql-test/t/sql_mode.test:
Auto merged
sql/sql_show.cc:
Auto merged
mysql-test/r/sql_mode.result:
Manual merge
Diffstat (limited to 'mysql-test/t/sql_mode.test')
-rw-r--r-- | mysql-test/t/sql_mode.test | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/t/sql_mode.test b/mysql-test/t/sql_mode.test index 10db520cd12..b11afe9e59d 100644 --- a/mysql-test/t/sql_mode.test +++ b/mysql-test/t/sql_mode.test @@ -86,6 +86,18 @@ drop table t1 ; --error 1231 set @@SQL_MODE=NULL; +# +# Bug #797: in sql_mode=ANSI, show create table ignores auto_increment +# +set session sql_mode=ansi; +create table t1 +(f1 integer auto_increment primary key, + f2 timestamp default current_timestamp on update current_timestamp); +show create table t1; +set session sql_mode=no_field_options; +show create table t1; +drop table t1; + # End of 4.1 tests # |