diff options
| author | Venkatesh Duggirala <venkatesh.duggirala@oracle.com> | 2013-01-28 14:58:55 +0530 |
|---|---|---|
| committer | Venkatesh Duggirala <venkatesh.duggirala@oracle.com> | 2013-01-28 14:58:55 +0530 |
| commit | 3c5326f8cc45ccecb12a03440e6a9647b07e8d34 (patch) | |
| tree | 3fbbd18780aa228d55458219e5a948b5a66f0c69 /mysql-test/r | |
| parent | 08a22ba1c9b0513d9a32509bbfe5b49261ee7676 (diff) | |
| parent | 7e0901b97fa087e4458f32ffd165103f31a1fef8 (diff) | |
| download | mariadb-git-3c5326f8cc45ccecb12a03440e6a9647b07e8d34.tar.gz | |
Bug#16084594 USER_VAR ITEM IN 'LOAD FILE QUERY' WAS NOT
PROPERLY QUOTED IN BINLOG FILE
Merging fix from mysql-5.1
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/func_compress.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/func_math.result | 8 | ||||
| -rw-r--r-- | mysql-test/r/variables.result | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/mysql-test/r/func_compress.result b/mysql-test/r/func_compress.result index 650cc9c2c70..011dec4d555 100644 --- a/mysql-test/r/func_compress.result +++ b/mysql-test/r/func_compress.result @@ -11,7 +11,7 @@ explain extended select uncompress(compress(@test_compress_string)); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used Warnings: -Note 1003 select uncompress(compress((@test_compress_string))) AS `uncompress(compress(@test_compress_string))` +Note 1003 select uncompress(compress((@`test_compress_string`))) AS `uncompress(compress(@test_compress_string))` select uncompressed_length(compress(@test_compress_string))=length(@test_compress_string); uncompressed_length(compress(@test_compress_string))=length(@test_compress_string) 1 @@ -19,7 +19,7 @@ explain extended select uncompressed_length(compress(@test_compress_string))=len id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used Warnings: -Note 1003 select (uncompressed_length(compress((@test_compress_string))) = length((@test_compress_string))) AS `uncompressed_length(compress(@test_compress_string))=length(@test_compress_string)` +Note 1003 select (uncompressed_length(compress((@`test_compress_string`))) = length((@`test_compress_string`))) AS `uncompressed_length(compress(@test_compress_string))=length(@test_compress_string)` select uncompressed_length(compress(@test_compress_string)); uncompressed_length(compress(@test_compress_string)) 117 diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result index 8d4a4171e21..ec0ca748c49 100644 --- a/mysql-test/r/func_math.result +++ b/mysql-test/r/func_math.result @@ -638,13 +638,13 @@ ERROR 22003: BIGINT value is out of range in '-('9223372036854775809')' DROP TABLE t1; SET @a:=999999999999999999999999999999999999999999999999999999999999999999999999999999999; SELECT @a + @a; -ERROR 22003: DECIMAL value is out of range in '((@a) + (@a))' +ERROR 22003: DECIMAL value is out of range in '((@`a`) + (@`a`))' SELECT @a * @a; -ERROR 22003: DECIMAL value is out of range in '((@a) * (@a))' +ERROR 22003: DECIMAL value is out of range in '((@`a`) * (@`a`))' SELECT -@a - @a; -ERROR 22003: DECIMAL value is out of range in '(-((@a)) - (@a))' +ERROR 22003: DECIMAL value is out of range in '(-((@`a`)) - (@`a`))' SELECT @a / 0.5; -ERROR 22003: DECIMAL value is out of range in '((@a) / 0.5)' +ERROR 22003: DECIMAL value is out of range in '((@`a`) / 0.5)' SELECT COT(1/0); COT(1/0) NULL diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 802476b3f76..359901b7aaa 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -77,7 +77,7 @@ explain extended select @t1:=(@t2:=1)+@t3:=4,@t1,@t2,@t3; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used Warnings: -Note 1003 select (@t1:=((@t2:=1) + (@t3:=4))) AS `@t1:=(@t2:=1)+@t3:=4`,(@t1) AS `@t1`,(@t2) AS `@t2`,(@t3) AS `@t3` +Note 1003 select (@t1:=((@t2:=1) + (@t3:=4))) AS `@t1:=(@t2:=1)+@t3:=4`,(@`t1`) AS `@t1`,(@`t2`) AS `@t2`,(@`t3`) AS `@t3` select @t5; @t5 1.23456 |