Merge MariaDB 10.0-base to MariaDB 10.0

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);