diff options
| author | unknown <sanja@askmonty.org> | 2010-02-01 08:14:12 +0200 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2010-02-01 08:14:12 +0200 |
| commit | e5099a2c85468d01d084b1071f724bc20766271d (patch) | |
| tree | 50e180dfcaa058cefb382d2ab931592cddbd007d /mysql-test/r/innodb.result | |
| parent | f83113df07d6ef8e8a6d1db8f6dc3bb90fb0652a (diff) | |
| parent | e9bce6c9d4bde35306b845e22e9b5ada69c4512f (diff) | |
| download | mariadb-git-e5099a2c85468d01d084b1071f724bc20766271d.tar.gz | |
merge 5.1->5.2
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) |