summaryrefslogtreecommitdiff
path: root/mysql-test/r/create.result
diff options
context:
space:
mode:
authorunknown <timour@askmonty.org>2012-10-18 15:57:12 +0300
committerunknown <timour@askmonty.org>2012-10-18 15:57:12 +0300
commit69a7b04add1d8102b9f5add88ae691d8b04727bc (patch)
treed8767b9ac1dd83919fd194feb3e0cb6451064c0a /mysql-test/r/create.result
parent807fef40fffbbb8e92564a52b902b504ba8cfcdc (diff)
parentbc4a456758c8077e5377b8cfaed60af4311653a0 (diff)
downloadmariadb-git-69a7b04add1d8102b9f5add88ae691d8b04727bc.tar.gz
Merge mdev-452 with the latest 10.0-base.
Diffstat (limited to 'mysql-test/r/create.result')
-rw-r--r--mysql-test/r/create.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index ba52959be84..7102968a8d7 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -55,9 +55,9 @@ ERROR 42000: Incorrect table name 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
create table a (`aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa` int);
ERROR 42000: Identifier name 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' is too long
create table t1 (a datetime default now());
-ERROR 42000: Invalid default value for 'a'
+drop table t1;
create table t1 (a datetime on update now());
-ERROR HY000: Invalid ON UPDATE clause for 'a' column
+drop table t1;
create table t1 (a int default 100 auto_increment);
ERROR 42000: Invalid default value for 'a'
create table t1 (a tinyint default 1000);