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/plugin.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/plugin.result')
| -rw-r--r-- | mysql-test/r/plugin.result | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/plugin.result b/mysql-test/r/plugin.result index ce338938d6f..62ae0e3747f 100644 --- a/mysql-test/r/plugin.result +++ b/mysql-test/r/plugin.result @@ -152,6 +152,14 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL `complex`='c,c,c' ) ENGINE=EXAMPLE DEFAULT CHARSET=latin1 `one_or_two`='ttt' `YESNO`=SSS `VAROPT`='5' `ULL`=10000000 +alter table t1 one_or_two=two; +Warnings: +Note 1105 EXAMPLE DEBUG: Field `a` COMPLEX 'c,c,c' -> 'c,c,c' +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL `complex`='c,c,c' +) ENGINE=EXAMPLE DEFAULT CHARSET=latin1 `YESNO`=SSS `VAROPT`='5' `ULL`=10000000 `one_or_two`=two drop table t1; #illegal value error SET SQL_MODE=''; @@ -194,6 +202,8 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=EXAMPLE DEFAULT CHARSET=latin1 `varopt`=15 alter table t1 varopt=default; +Warnings: +Note 1105 EXAMPLE DEBUG: Field `a` COMPLEX '(null)' -> '(null)' show create table t1; Table Create Table t1 CREATE TABLE `t1` ( |