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/show_check.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/show_check.result')
| -rw-r--r-- | mysql-test/r/show_check.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index 44a37b9a9e5..0e4cf6c6775 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -198,7 +198,7 @@ show create table t2; Table Create Table t2 CREATE TEMPORARY TABLE `t2` ( `a` int(11) NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 DELAY_KEY_WRITE=1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t2; create table t1 ( test_set set( 'val1', 'val2', 'val3' ) not null default '', |