diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 19:24:20 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 19:24:20 +0200 |
| commit | 13dca0125a14726d2c3274f679aa002d0f7577a0 (patch) | |
| tree | fcfb6d72dcfb5af60bd8158b1641318295b9b609 /mysql-test/r/join_outer_innodb.result | |
| parent | d1fdb17bfb774e4e29c8a337b497128fd01a3473 (diff) | |
| download | mariadb-git-13dca0125a14726d2c3274f679aa002d0f7577a0.tar.gz | |
more post-merge fixes:
* update results
* don't force HA_CREATE_DELAY_KEY_WRITE on all temp tables,
(bad for CREATE ... LIKE) instead imply it in myisam/aria
* restore HA_ERR_TABLE_DEF_CHANGED in archive
* increase the default number of rwlock classes in P_S to fit all our rwlocks
Diffstat (limited to 'mysql-test/r/join_outer_innodb.result')
| -rw-r--r-- | mysql-test/r/join_outer_innodb.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/join_outer_innodb.result b/mysql-test/r/join_outer_innodb.result index 1081fc0eed3..95f6b3ab9a2 100644 --- a/mysql-test/r/join_outer_innodb.result +++ b/mysql-test/r/join_outer_innodb.result @@ -481,9 +481,9 @@ drop table t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14,t15,t16; # drop table if exists t1,t2,t3; Warnings: -Note 1051 Unknown table 't1' -Note 1051 Unknown table 't2' -Note 1051 Unknown table 't3' +Note 1051 Unknown table 'test.t1' +Note 1051 Unknown table 'test.t2' +Note 1051 Unknown table 'test.t3' create table t2(a int,unique key (a)) engine=innodb; create table t3(b int) engine=innodb; create table t1(a int,b int)engine=innodb; |