summaryrefslogtreecommitdiff
path: root/mysql-test/t/deprecated_features.test
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-10-19 21:45:18 +0200
committerSergei Golubchik <sergii@pisem.net>2011-10-19 21:45:18 +0200
commit76f0b94bb0b2994d639353530c5b251d0f1a204b (patch)
tree9ed50628aac34f89a37637bab2fc4915b86b5eb4 /mysql-test/t/deprecated_features.test
parent4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff)
parent5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff)
downloadmariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz
merge with 5.3
sql/sql_insert.cc: CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. ****** CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. sql/sql_table.cc: small cleanup ****** small cleanup
Diffstat (limited to 'mysql-test/t/deprecated_features.test')
-rw-r--r--mysql-test/t/deprecated_features.test2
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/t/deprecated_features.test b/mysql-test/t/deprecated_features.test
index 002f4ad1122..a9c5a5ae5ff 100644
--- a/mysql-test/t/deprecated_features.test
+++ b/mysql-test/t/deprecated_features.test
@@ -17,8 +17,6 @@ load data from master;
--error ER_PARSE_ERROR
SHOW INNODB STATUS;
--error ER_PARSE_ERROR
-create table t1 (t6 timestamp(6));
---error ER_PARSE_ERROR
create table t1 (t6 timestamp) type=myisam;
--error ER_PARSE_ERROR
show table types;