summaryrefslogtreecommitdiff
path: root/mysql-test/t/innodb.test
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2010-01-15 16:58:25 +0100
committerunknown <knielsen@knielsen-hq.org>2010-01-15 16:58:25 +0100
commit13029651b5535d637aa6f652f17c8c4417a803bc (patch)
treeb65c4d4bf3227b2e2b86c13f4d098b57e9a60410 /mysql-test/t/innodb.test
parentd121e6630519a66eec7c953ee0eae623f592ce87 (diff)
parent5b0ab60a4bfb4d5b603cd929b7ceb0d9fd1bac22 (diff)
downloadmariadb-git-13029651b5535d637aa6f652f17c8c4417a803bc.tar.gz
Merge XtraDB 9 into MariaDB.
Diffstat (limited to 'mysql-test/t/innodb.test')
-rw-r--r--mysql-test/t/innodb.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test
index 599c6f10d23..19e5180dc8b 100644
--- a/mysql-test/t/innodb.test
+++ b/mysql-test/t/innodb.test
@@ -2270,7 +2270,7 @@ disconnect j;
drop table t1, t2, t3, t5, t6, t8, t9;
# bug 18934, "InnoDB crashes when table uses column names like DB_ROW_ID"
---error 1005
+--error ER_WRONG_COLUMN_NAME
CREATE TABLE t1 (DB_ROW_ID int) engine=innodb;
#