diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-01-15 16:58:25 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-01-15 16:58:25 +0100 |
| commit | 13029651b5535d637aa6f652f17c8c4417a803bc (patch) | |
| tree | b65c4d4bf3227b2e2b86c13f4d098b57e9a60410 /mysql-test/r/innodb.result | |
| parent | d121e6630519a66eec7c953ee0eae623f592ce87 (diff) | |
| parent | 5b0ab60a4bfb4d5b603cd929b7ceb0d9fd1bac22 (diff) | |
| download | mariadb-git-13029651b5535d637aa6f652f17c8c4417a803bc.tar.gz | |
Merge XtraDB 9 into MariaDB.
Diffstat (limited to 'mysql-test/r/innodb.result')
| -rw-r--r-- | mysql-test/r/innodb.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index 021bf34a132..9cfa825447b 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -3090,7 +3090,7 @@ ERROR HY000: Lock wait timeout exceeded; try restarting transaction commit; drop table t1, t2, t3, t5, t6, t8, t9; CREATE TABLE t1 (DB_ROW_ID int) engine=innodb; -ERROR HY000: Can't create table 'test.t1' (errno: -1) +ERROR 42000: Incorrect column name 'DB_ROW_ID' CREATE TABLE t1 ( a BIGINT(20) NOT NULL, PRIMARY KEY (a) |