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/multi_update.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/multi_update.result')
| -rw-r--r-- | mysql-test/r/multi_update.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/multi_update.result b/mysql-test/r/multi_update.result index 3c67889ce10..d974080d99b 100644 --- a/mysql-test/r/multi_update.result +++ b/mysql-test/r/multi_update.result @@ -695,7 +695,7 @@ DROP TABLE t1; # DROP TABLE IF EXISTS t1; Warnings: -Note 1051 Unknown table 't1' +Note 1051 Unknown table 'test.t1' CREATE TABLE t1 ( id int(10) unsigned NOT NULL, level tinyint(3) unsigned NOT NULL, @@ -704,7 +704,7 @@ PRIMARY KEY (id) INSERT INTO t1 VALUES (2519583,1); DROP TABLE IF EXISTS t2; Warnings: -Note 1051 Unknown table 't2' +Note 1051 Unknown table 'test.t2' CREATE TABLE t2 ( club_id int(11) NOT NULL DEFAULT '0', profile_id int(11) NOT NULL DEFAULT '0', @@ -714,7 +714,7 @@ PRIMARY KEY (profile_id,club_id) INSERT INTO t2 VALUES (2,2519583,12); DROP TABLE IF EXISTS t3; Warnings: -Note 1051 Unknown table 't3' +Note 1051 Unknown table 'test.t3' CREATE TABLE t3 ( member_level_id int(11) unsigned NOT NULL DEFAULT '0', map_level int(11) unsigned NOT NULL DEFAULT '0', |