diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-12-12 23:58:40 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-12-12 23:58:40 +0100 |
| commit | 2ccf247e939b39d1f84908a56b8717150e5fd1b4 (patch) | |
| tree | c0a9a318a055f87e13206656d7765f96d3293d9f /mysql-test/r/myisam.result | |
| parent | 6cc9d0ffa0b6d9d0f19cf9445fad0e0ba11e38f8 (diff) | |
| download | mariadb-git-2ccf247e939b39d1f84908a56b8717150e5fd1b4.tar.gz | |
after merge changes:
* rename all debugging related command-line options
and variables to start from "debug-", and made them all
OFF by default.
* replace "MySQL" with "MariaDB" in error messages
* "Cast ... converted ... integer to it's ... complement"
is now a note, not a warning
* @@query_cache_strip_comments now has a session scope,
not global.
Diffstat (limited to 'mysql-test/r/myisam.result')
| -rw-r--r-- | mysql-test/r/myisam.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result index c96f7bb4e51..e179d7ec207 100644 --- a/mysql-test/r/myisam.result +++ b/mysql-test/r/myisam.result @@ -1774,7 +1774,7 @@ create table t1 (c1 int) engine=myisam pack_keys=0; create table t2 (c1 int) engine=myisam pack_keys=1; create table t3 (c1 int) engine=myisam pack_keys=default; create table t4 (c1 int) engine=myisam pack_keys=2; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '2' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '2' at line 1 drop table t1, t2, t3; CREATE TABLE t1(a INT, b INT, KEY inx (a), UNIQUE KEY uinx (b)) ENGINE=MyISAM; INSERT INTO t1(a,b) VALUES (1,1),(2,2),(3,3),(4,4),(5,5); @@ -2051,9 +2051,9 @@ t1 CREATE TABLE `t1` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; create table t1 (a int not null, key key_block_size=1024 (a)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '=1024 (a))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '=1024 (a))' at line 1 create table t1 (a int not null, key `a` key_block_size=1024 (a)); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_block_size=1024 (a))' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'key_block_size=1024 (a))' at line 1 CREATE TABLE t1 ( c1 INT, c2 VARCHAR(300), |