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/select.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/select.result')
| -rw-r--r-- | mysql-test/r/select.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index 71c1fafe4c0..4ae9197823a 100644 --- a/mysql-test/r/select.result +++ b/mysql-test/r/select.result @@ -2094,7 +2094,7 @@ drop table t4, t3, t2, t1; DO 1; DO benchmark(100,1+1),1,1; do default; -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 '' 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 '' at line 1 do foobar; ERROR 42S22: Unknown column 'foobar' in 'field list' CREATE TABLE t1 ( @@ -3401,7 +3401,7 @@ f1 f2 f2 NULL a NULL drop table t1,t2; select * from (select * left join t on f1=f2) tt; -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 'on f1=f2) tt' 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 'on f1=f2) tt' at line 1 CREATE TABLE t1 (sku int PRIMARY KEY, pr int); CREATE TABLE t2 (sku int PRIMARY KEY, sppr int, name varchar(255)); INSERT INTO t1 VALUES @@ -3651,7 +3651,7 @@ DROP TABLE IF EXISTS t1; CREATE TABLE t1(a int); INSERT into t1 values (1), (2), (3); SELECT * FROM t1 LIMIT 2, -1; -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 '-1' 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 '-1' at line 1 DROP TABLE t1; CREATE TABLE t1 ( ID_with_null int NULL, |