diff options
author | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
commit | b4a0b2c2f862ab0de853dc34e1e56f6159043e45 (patch) | |
tree | 18a0c25fdc9ac0076da19247666414a46434b85e /mysql-test/r/plugin.result | |
parent | 9809f05199aeb0b67991fac41bd86f38730768dc (diff) | |
download | mariadb-git-b4a0b2c2f862ab0de853dc34e1e56f6159043e45.tar.gz |
post-merge fixes.
most tests pass.
5.3 merge is next
Diffstat (limited to 'mysql-test/r/plugin.result')
-rw-r--r-- | mysql-test/r/plugin.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/plugin.result b/mysql-test/r/plugin.result index 1529a0dfe95..73f1779badc 100644 --- a/mysql-test/r/plugin.result +++ b/mysql-test/r/plugin.result @@ -75,9 +75,9 @@ SET SQL_MODE='IGNORE_BAD_TABLE_OPTIONS'; #illegal value fixed CREATE TABLE t1 (a int) ENGINE=example ULL=10000000000000000000 one_or_two='ttt' YESNO=SSS; Warnings: -Warning 1708 Incorrect value '10000000000000000000' for option 'ULL' -Warning 1708 Incorrect value 'ttt' for option 'one_or_two' -Warning 1708 Incorrect value 'SSS' for option 'YESNO' +Warning 1723 Incorrect value '10000000000000000000' for option 'ULL' +Warning 1723 Incorrect value 'ttt' for option 'one_or_two' +Warning 1723 Incorrect value 'SSS' for option 'YESNO' show create table t1; Table Create Table t1 CREATE TABLE `t1` ( |