diff options
Diffstat (limited to 'mysql-test/main')
| -rw-r--r-- | mysql-test/main/ansi.result | 16 | ||||
| -rw-r--r-- | mysql-test/main/compare.result | 4 | ||||
| -rw-r--r-- | mysql-test/main/ctype_binary.result | 4 | ||||
| -rw-r--r-- | mysql-test/main/ctype_cp1250_ch.result | 8 | ||||
| -rw-r--r-- | mysql-test/main/ctype_cp1251.result | 2 | ||||
| -rw-r--r-- | mysql-test/main/ctype_latin1.result | 18 | ||||
| -rw-r--r-- | mysql-test/main/ctype_latin2_ch.result | 8 | ||||
| -rw-r--r-- | mysql-test/main/ctype_tis620.result | 16 | ||||
| -rw-r--r-- | mysql-test/main/ctype_uca.result | 20 | ||||
| -rw-r--r-- | mysql-test/main/ctype_ucs.result | 18 | ||||
| -rw-r--r-- | mysql-test/main/ctype_utf8.result | 20 | ||||
| -rw-r--r-- | mysql-test/main/func_like.result | 2 | ||||
| -rw-r--r-- | mysql-test/main/func_str.result | 36 | ||||
| -rw-r--r-- | mysql-test/main/keywords.result | 24 | ||||
| -rw-r--r-- | mysql-test/main/null.result | 4 | ||||
| -rw-r--r-- | mysql-test/main/order_by.result | 2 | ||||
| -rw-r--r-- | mysql-test/main/precedence.result | 124 | ||||
| -rw-r--r-- | mysql-test/main/selectivity.result | 4 | ||||
| -rw-r--r-- | mysql-test/main/subselect_mat.result | 10 | ||||
| -rw-r--r-- | mysql-test/main/subselect_sj_mat.result | 10 | ||||
| -rw-r--r-- | mysql-test/main/type_date.result | 2 |
21 files changed, 176 insertions, 176 deletions
diff --git a/mysql-test/main/ansi.result b/mysql-test/main/ansi.result index b1b41f52c1c..b4ba4dcb32a 100644 --- a/mysql-test/main/ansi.result +++ b/mysql-test/main/ansi.result @@ -60,12 +60,12 @@ EXPLAIN EXTENDED SELECT -1<<1||1 AS a FROM DUAL; 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 -1 << concat(1,1) AS "a" +Note 1003 select -1 << mariadb_schema.concat(1,1) AS "a" EXPLAIN EXTENDED SELECT -1||0<<1 AS a FROM DUAL; 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 concat(-1,0) << 1 AS "a" +Note 1003 select mariadb_schema.concat(-1,0) << 1 AS "a" SELECT -1+1||1 AS a FROM DUAL; a 10 @@ -76,12 +76,12 @@ EXPLAIN EXTENDED SELECT -1+1||1 AS a FROM DUAL; 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 -1 + concat(1,1) AS "a" +Note 1003 select -1 + mariadb_schema.concat(1,1) AS "a" EXPLAIN EXTENDED SELECT -1||0+1 AS a FROM DUAL; 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 concat(-1,0) + 1 AS "a" +Note 1003 select mariadb_schema.concat(-1,0) + 1 AS "a" SELECT 1*1||-1 AS a FROM DUAL; a 1 @@ -94,12 +94,12 @@ EXPLAIN EXTENDED SELECT 1*1||-1 AS a FROM DUAL; 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 1 * concat(1,-1) AS "a" +Note 1003 select 1 * mariadb_schema.concat(1,-1) AS "a" EXPLAIN EXTENDED SELECT 1||1*-1 AS a FROM DUAL; 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 concat(1,1) * -1 AS "a" +Note 1003 select mariadb_schema.concat(1,1) * -1 AS "a" SELECT -1^1||1 AS a FROM DUAL; a 18446744073709551604 @@ -110,9 +110,9 @@ EXPLAIN EXTENDED SELECT -1^1||1 AS a FROM DUAL; 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 -1 ^ concat(1,1) AS "a" +Note 1003 select -1 ^ mariadb_schema.concat(1,1) AS "a" EXPLAIN EXTENDED SELECT -1||0^1 AS a FROM DUAL; 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 concat(-1,0) ^ 1 AS "a" +Note 1003 select mariadb_schema.concat(-1,0) ^ 1 AS "a" diff --git a/mysql-test/main/compare.result b/mysql-test/main/compare.result index b8883784d21..dc44fd82349 100644 --- a/mysql-test/main/compare.result +++ b/mysql-test/main/compare.result @@ -64,7 +64,7 @@ EXPLAIN EXTENDED SELECT b,c FROM t1 WHERE b = 1 AND CONCAT(b,c) = '0101'; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 3 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c` from `test`.`t1` where `test`.`t1`.`b` = 1 and concat(`test`.`t1`.`b`,`test`.`t1`.`c`) = '0101' +Note 1003 select `test`.`t1`.`b` AS `b`,`test`.`t1`.`c` AS `c` from `test`.`t1` where `test`.`t1`.`b` = 1 and mariadb_schema.concat(`test`.`t1`.`b`,`test`.`t1`.`c`) = '0101' SELECT b,c FROM t1 WHERE b = 1 AND CONCAT(b,c) = '0101'; b c 01 01 @@ -88,7 +88,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra Warnings: Note 1276 Field or reference 'test.t2.a' of SELECT #2 was resolved in SELECT #1 Note 1276 Field or reference 'test.t2.a' of SELECT #2 was resolved in SELECT #1 -Note 1003 /* select#1 */ select `test`.`t2`.`a` AS `a`,<expr_cache><`test`.`t2`.`a`>((/* select#2 */ select count(0) from `test`.`t1` where `test`.`t1`.`b` = `test`.`t2`.`a` and concat(`test`.`t1`.`b`,`test`.`t1`.`c`) = concat('0',`test`.`t2`.`a`,'01'))) AS `x` from `test`.`t2` order by `test`.`t2`.`a` +Note 1003 /* select#1 */ select `test`.`t2`.`a` AS `a`,<expr_cache><`test`.`t2`.`a`>((/* select#2 */ select count(0) from `test`.`t1` where `test`.`t1`.`b` = `test`.`t2`.`a` and mariadb_schema.concat(`test`.`t1`.`b`,`test`.`t1`.`c`) = mariadb_schema.concat('0',`test`.`t2`.`a`,'01'))) AS `x` from `test`.`t2` order by `test`.`t2`.`a` DROP TABLE t1,t2; CREATE TABLE t1 (a TIMESTAMP); INSERT INTO t1 VALUES (NOW()),(NOW()),(NOW()); diff --git a/mysql-test/main/ctype_binary.result b/mysql-test/main/ctype_binary.result index 02aa08272c1..94a55a04927 100644 --- a/mysql-test/main/ctype_binary.result +++ b/mysql-test/main/ctype_binary.result @@ -2876,7 +2876,7 @@ Note 1003 select v_LastPaymentDate@0 < current_timestamp() AS `v_LastPaymentDate 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 concat(v_LastPaymentDate@0,current_timestamp()) AS `CONCAT(v_LastPaymentDate, NOW())` +Note 1003 select mariadb_schema.concat(v_LastPaymentDate@0,current_timestamp()) AS `CONCAT(v_LastPaymentDate, NOW())` DROP PROCEDURE p1; # # Bug#52159 returning time type from function and empty left join causes debug assertion @@ -3017,7 +3017,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; # # MDEV-8694 Wrong result for SELECT..WHERE a NOT LIKE 'a ' AND a='a' diff --git a/mysql-test/main/ctype_cp1250_ch.result b/mysql-test/main/ctype_cp1250_ch.result index b0aa4cff382..db4341b6cea 100644 --- a/mysql-test/main/ctype_cp1250_ch.result +++ b/mysql-test/main/ctype_cp1250_ch.result @@ -129,7 +129,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'a' and concat(`test`.`t1`.`c1`) like 'a ' +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where mariadb_schema.concat(`test`.`t1`.`c1`) = 'a' and mariadb_schema.concat(`test`.`t1`.`c1`) like 'a ' DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -152,7 +152,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = concat(`test`.`t1`.`c1`) and 'a ' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a ' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -175,7 +175,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -198,7 +198,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; # # MDEV-8694 Wrong result for SELECT..WHERE a NOT LIKE 'a ' AND a='a' diff --git a/mysql-test/main/ctype_cp1251.result b/mysql-test/main/ctype_cp1251.result index ce0a2c45b3e..43d3f008a1e 100644 --- a/mysql-test/main/ctype_cp1251.result +++ b/mysql-test/main/ctype_cp1251.result @@ -3285,7 +3285,7 @@ Note 1003 select v_LastPaymentDate@0 < current_timestamp() AS `v_LastPaymentDate 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 concat(convert(v_LastPaymentDate@0 using cp1251),current_timestamp()) AS `CONCAT(v_LastPaymentDate, NOW())` +Note 1003 select mariadb_schema.concat(convert(v_LastPaymentDate@0 using cp1251),current_timestamp()) AS `CONCAT(v_LastPaymentDate, NOW())` DROP PROCEDURE p1; # # Bug#52159 returning time type from function and empty left join causes debug assertion diff --git a/mysql-test/main/ctype_latin1.result b/mysql-test/main/ctype_latin1.result index df1e69f2e3e..a6a89545ed4 100644 --- a/mysql-test/main/ctype_latin1.result +++ b/mysql-test/main/ctype_latin1.result @@ -3594,7 +3594,7 @@ Note 1003 select v_LastPaymentDate@0 < current_timestamp() AS `v_LastPaymentDate 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 concat(v_LastPaymentDate@0,current_timestamp()) AS `CONCAT(v_LastPaymentDate, NOW())` +Note 1003 select mariadb_schema.concat(v_LastPaymentDate@0,current_timestamp()) AS `CONCAT(v_LastPaymentDate, NOW())` DROP PROCEDURE p1; # # Bug#52159 returning time type from function and empty left join causes debug assertion @@ -7740,7 +7740,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'a' and concat(`test`.`t1`.`c1`) like 'a ' +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where mariadb_schema.concat(`test`.`t1`.`c1`) = 'a' and mariadb_schema.concat(`test`.`t1`.`c1`) like 'a ' DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -7763,7 +7763,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = concat(`test`.`t1`.`c1`) and 'a ' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a ' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -7786,7 +7786,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -7809,7 +7809,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; # # MDEV-8694 Wrong result for SELECT..WHERE a NOT LIKE 'a ' AND a='a' @@ -7861,7 +7861,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'a' and concat(`test`.`t1`.`c1`) like 'a ' +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where mariadb_schema.concat(`test`.`t1`.`c1`) = 'a' and mariadb_schema.concat(`test`.`t1`.`c1`) like 'a ' DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -7884,7 +7884,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = concat(`test`.`t1`.`c1`) and 'a ' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a ' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -7907,7 +7907,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -7930,7 +7930,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; # # MDEV-8694 Wrong result for SELECT..WHERE a NOT LIKE 'a ' AND a='a' diff --git a/mysql-test/main/ctype_latin2_ch.result b/mysql-test/main/ctype_latin2_ch.result index 0286cc1f172..01e39deabff 100644 --- a/mysql-test/main/ctype_latin2_ch.result +++ b/mysql-test/main/ctype_latin2_ch.result @@ -71,7 +71,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'a' and concat(`test`.`t1`.`c1`) like 'a ' +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where mariadb_schema.concat(`test`.`t1`.`c1`) = 'a' and mariadb_schema.concat(`test`.`t1`.`c1`) like 'a ' DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -94,7 +94,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = concat(`test`.`t1`.`c1`) and 'a ' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a ' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -117,7 +117,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -140,7 +140,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; # # MDEV-8694 Wrong result for SELECT..WHERE a NOT LIKE 'a ' AND a='a' diff --git a/mysql-test/main/ctype_tis620.result b/mysql-test/main/ctype_tis620.result index 5655eb124b2..16b399cf3bd 100644 --- a/mysql-test/main/ctype_tis620.result +++ b/mysql-test/main/ctype_tis620.result @@ -3145,7 +3145,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'a' and concat(`test`.`t1`.`c1`) like 'a ' +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where mariadb_schema.concat(`test`.`t1`.`c1`) = 'a' and mariadb_schema.concat(`test`.`t1`.`c1`) like 'a ' DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -3168,7 +3168,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = concat(`test`.`t1`.`c1`) and 'a ' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a ' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -3191,7 +3191,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -3214,7 +3214,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; # # MDEV-8694 Wrong result for SELECT..WHERE a NOT LIKE 'a ' AND a='a' @@ -3367,7 +3367,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'a' and concat(`test`.`t1`.`c1`) like 'a ' +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where mariadb_schema.concat(`test`.`t1`.`c1`) = 'a' and mariadb_schema.concat(`test`.`t1`.`c1`) like 'a ' DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -3390,7 +3390,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = concat(`test`.`t1`.`c1`) and 'a ' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a ' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -3413,7 +3413,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -3436,7 +3436,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; # # MDEV-8694 Wrong result for SELECT..WHERE a NOT LIKE 'a ' AND a='a' diff --git a/mysql-test/main/ctype_uca.result b/mysql-test/main/ctype_uca.result index 2298733851d..e1aa2b014bf 100644 --- a/mysql-test/main/ctype_uca.result +++ b/mysql-test/main/ctype_uca.result @@ -8428,7 +8428,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'a' and concat(`test`.`t1`.`c1`) like 'a ' +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where mariadb_schema.concat(`test`.`t1`.`c1`) = 'a' and mariadb_schema.concat(`test`.`t1`.`c1`) like 'a ' DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -8451,7 +8451,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = concat(`test`.`t1`.`c1`) and 'a ' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a ' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -8474,7 +8474,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -8497,7 +8497,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; # # MDEV-8694 Wrong result for SELECT..WHERE a NOT LIKE 'a ' AND a='a' @@ -8559,7 +8559,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='ä' AND CONCAT(c1) LIKE 'ae' id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'ä' and concat(`test`.`t1`.`c1`) like 'ae' +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where mariadb_schema.concat(`test`.`t1`.`c1`) = 'ä' and mariadb_schema.concat(`test`.`t1`.`c1`) like 'ae' DROP TABLE IF EXISTS t1; SET NAMES utf8 COLLATE utf8_german2_ci; # @@ -8586,7 +8586,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'a' and concat(`test`.`t1`.`c1`) like 'a ' +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where mariadb_schema.concat(`test`.`t1`.`c1`) = 'a' and mariadb_schema.concat(`test`.`t1`.`c1`) like 'a ' DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -8609,7 +8609,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = concat(`test`.`t1`.`c1`) and 'a ' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a ' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -8632,7 +8632,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -8655,7 +8655,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; # # MDEV-8694 Wrong result for SELECT..WHERE a NOT LIKE 'a ' AND a='a' @@ -8721,7 +8721,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='ä' AND CONCAT(c1) LIKE 'ae' id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'ä' and concat(`test`.`t1`.`c1`) like 'ae' +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where mariadb_schema.concat(`test`.`t1`.`c1`) = 'ä' and mariadb_schema.concat(`test`.`t1`.`c1`) like 'ae' DROP TABLE IF EXISTS t1; # # MDEV-4929 Myanmar collation diff --git a/mysql-test/main/ctype_ucs.result b/mysql-test/main/ctype_ucs.result index efd77990010..ff2ab87a825 100644 --- a/mysql-test/main/ctype_ucs.result +++ b/mysql-test/main/ctype_ucs.result @@ -4478,7 +4478,7 @@ Note 1003 select v_LastPaymentDate@0 < current_timestamp() AS `v_LastPaymentDate 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 concat(convert(v_LastPaymentDate@0 using ucs2),convert(current_timestamp() using ucs2)) AS `CONCAT(v_LastPaymentDate, NOW())` +Note 1003 select mariadb_schema.concat(convert(v_LastPaymentDate@0 using ucs2),convert(current_timestamp() using ucs2)) AS `CONCAT(v_LastPaymentDate, NOW())` DROP PROCEDURE p1; # # Bug#52159 returning time type from function and empty left join causes debug assertion @@ -5456,7 +5456,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'a' and concat(`test`.`t1`.`c1`) like 'a ' +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where mariadb_schema.concat(`test`.`t1`.`c1`) = 'a' and mariadb_schema.concat(`test`.`t1`.`c1`) like 'a ' DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -5479,7 +5479,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = concat(`test`.`t1`.`c1`) and 'a ' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a ' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -5502,7 +5502,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -5525,7 +5525,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; # # MDEV-8694 Wrong result for SELECT..WHERE a NOT LIKE 'a ' AND a='a' @@ -5577,7 +5577,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'a' and concat(`test`.`t1`.`c1`) like 'a ' +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where mariadb_schema.concat(`test`.`t1`.`c1`) = 'a' and mariadb_schema.concat(`test`.`t1`.`c1`) like 'a ' DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -5600,7 +5600,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = concat(`test`.`t1`.`c1`) and 'a ' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a ' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -5623,7 +5623,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -5646,7 +5646,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; # # MDEV-8694 Wrong result for SELECT..WHERE a NOT LIKE 'a ' AND a='a' diff --git a/mysql-test/main/ctype_utf8.result b/mysql-test/main/ctype_utf8.result index 955530c6b14..8d6bb9d9e78 100644 --- a/mysql-test/main/ctype_utf8.result +++ b/mysql-test/main/ctype_utf8.result @@ -5345,7 +5345,7 @@ Note 1003 select v_LastPaymentDate@0 < current_timestamp() AS `v_LastPaymentDate 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 concat(convert(v_LastPaymentDate@0 using utf8),current_timestamp()) AS `CONCAT(v_LastPaymentDate, NOW())` +Note 1003 select mariadb_schema.concat(convert(v_LastPaymentDate@0 using utf8),current_timestamp()) AS `CONCAT(v_LastPaymentDate, NOW())` DROP PROCEDURE p1; # # Bug#52159 returning time type from function and empty left join causes debug assertion @@ -6808,7 +6808,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'a' and concat(`test`.`t1`.`c1`) like 'a ' +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where mariadb_schema.concat(`test`.`t1`.`c1`) = 'a' and mariadb_schema.concat(`test`.`t1`.`c1`) like 'a ' DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -6831,7 +6831,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = concat(`test`.`t1`.`c1`) and 'a ' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a ' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -6854,7 +6854,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -6877,7 +6877,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; # # MDEV-8694 Wrong result for SELECT..WHERE a NOT LIKE 'a ' AND a='a' @@ -6929,7 +6929,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='a' AND CONCAT(c1) LIKE 'a '; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'a' and concat(`test`.`t1`.`c1`) like 'a ' +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where mariadb_schema.concat(`test`.`t1`.`c1`) = 'a' and mariadb_schema.concat(`test`.`t1`.`c1`) like 'a ' DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -6952,7 +6952,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE 'a'=CONCAT(c1) AND 'a ' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = concat(`test`.`t1`.`c1`) and 'a ' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where 'a' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a ' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -6975,7 +6975,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '% '=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '% ' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; CREATE TABLE t1 AS SELECT REPEAT('a', 10) AS c1 LIMIT 0; SHOW CREATE TABLE t1; @@ -6998,7 +6998,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE '%'=CONCAT(c1) AND 'a' LIKE CONCAT(c1); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = concat(`test`.`t1`.`c1`) and 'a' like concat(`test`.`t1`.`c1`) +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where '%' = mariadb_schema.concat(`test`.`t1`.`c1`) and 'a' like mariadb_schema.concat(`test`.`t1`.`c1`) DROP TABLE t1; # # MDEV-8694 Wrong result for SELECT..WHERE a NOT LIKE 'a ' AND a='a' @@ -7060,7 +7060,7 @@ EXPLAIN EXTENDED SELECT * FROM t1 WHERE CONCAT(c1)='ä' AND CONCAT(c1) LIKE 'ae' id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where concat(`test`.`t1`.`c1`) = 'ä' and concat(`test`.`t1`.`c1`) like 'ae' +Note 1003 select `test`.`t1`.`c1` AS `c1` from `test`.`t1` where mariadb_schema.concat(`test`.`t1`.`c1`) = 'ä' and mariadb_schema.concat(`test`.`t1`.`c1`) like 'ae' DROP TABLE IF EXISTS t1; # # MDEV-6666 Malformed result for CONCAT(utf8_column, binary_string) diff --git a/mysql-test/main/func_like.result b/mysql-test/main/func_like.result index 8cff5d9bafb..8e05f4b5cd7 100644 --- a/mysql-test/main/func_like.result +++ b/mysql-test/main/func_like.result @@ -10,7 +10,7 @@ explain extended select * from t1 where a like concat('abc','%'); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 index a a 13 NULL 5 40.00 Using where; Using index Warnings: -Note 1003 select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` like <cache>(concat('abc','%')) +Note 1003 select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` like <cache>(mariadb_schema.concat('abc','%')) select * from t1 where a like "abc%"; a abc diff --git a/mysql-test/main/func_str.result b/mysql-test/main/func_str.result index 4e36acd25ca..a5e91f5044e 100644 --- a/mysql-test/main/func_str.result +++ b/mysql-test/main/func_str.result @@ -867,7 +867,7 @@ explain extended select concat('*',space(5),'*'); 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 concat('*',space(5),'*') AS `concat('*',space(5),'*')` +Note 1003 select mariadb_schema.concat('*',space(5),'*') AS `concat('*',space(5),'*')` explain extended select reverse('abc'); 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 @@ -877,22 +877,22 @@ explain extended select rpad('a',4,'1'); 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 rpad('a',4,'1') AS `rpad('a',4,'1')` +Note 1003 select mariadb_schema.rpad('a',4,'1') AS `rpad('a',4,'1')` explain extended select lpad('a',4,'1'); 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 lpad('a',4,'1') AS `lpad('a',4,'1')` +Note 1003 select mariadb_schema.lpad('a',4,'1') AS `lpad('a',4,'1')` explain extended select rpad('a',4); 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 rpad('a',4) AS `rpad('a',4)` +Note 1003 select mariadb_schema.rpad('a',4) AS `rpad('a',4)` explain extended select lpad('a',4); 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 lpad('a',4) AS `lpad('a',4)` +Note 1003 select mariadb_schema.lpad('a',4) AS `lpad('a',4)` explain extended select concat_ws(',','',NULL,'a'); 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 @@ -982,7 +982,7 @@ explain extended select concat('monty',' was here ','again'); 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 concat('monty',' was here ','again') AS `concat('monty',' was here ','again')` +Note 1003 select mariadb_schema.concat('monty',' was here ','again') AS `concat('monty',' was here ','again')` explain extended select length('hello'); 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 @@ -1012,7 +1012,7 @@ explain extended select replace('aaaa','a','b'); 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 replace('aaaa','a','b') AS `replace('aaaa','a','b')` +Note 1003 select mariadb_schema.replace('aaaa','a','b') AS `replace('aaaa','a','b')` explain extended select insert('txs',2,1,'hi'); 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 @@ -1042,7 +1042,7 @@ explain extended select SUBSTR('abcdefg',3,2); 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 substr('abcdefg',3,2) AS `SUBSTR('abcdefg',3,2)` +Note 1003 select mariadb_schema.substr('abcdefg',3,2) AS `SUBSTR('abcdefg',3,2)` explain extended select substring_index("1abcd;2abcd;3abcd;4abcd", ';', 2); 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 @@ -1052,22 +1052,22 @@ explain extended select trim(_latin2' a '); 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 trim(_latin2' a ') AS `trim(_latin2' a ')` +Note 1003 select mariadb_schema.trim(_latin2' a ') AS `trim(_latin2' a ')` explain extended select ltrim(_latin2' a '); 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 ltrim(_latin2' a ') AS `ltrim(_latin2' a ')` +Note 1003 select mariadb_schema.ltrim(_latin2' a ') AS `ltrim(_latin2' a ')` explain extended select rtrim(_latin2' a '); 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 rtrim(_latin2' a ') AS `rtrim(_latin2' a ')` +Note 1003 select mariadb_schema.rtrim(_latin2' a ') AS `rtrim(_latin2' a ')` explain extended select decode(encode(repeat("a",100000),"monty"),"monty"); 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 decode(encode(repeat('a',100000),'monty'),'monty') AS `decode(encode(repeat("a",100000),"monty"),"monty")` +Note 1003 select mariadb_schema.decode(encode(repeat('a',100000),'monty'),'monty') AS `decode(encode(repeat("a",100000),"monty"),"monty")` SELECT lpad(12345, 5, "#"); lpad(12345, 5, "#") 12345 @@ -1316,27 +1316,27 @@ EXPLAIN EXTENDED SELECT s FROM t1 WHERE TRIM(s) > 'ab'; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`s` AS `s` from `test`.`t1` where trim(`test`.`t1`.`s`) > 'ab' +Note 1003 select `test`.`t1`.`s` AS `s` from `test`.`t1` where mariadb_schema.trim(`test`.`t1`.`s`) > 'ab' EXPLAIN EXTENDED SELECT s FROM t1 WHERE TRIM('y' FROM s) > 'ab'; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`s` AS `s` from `test`.`t1` where trim(both 'y' from `test`.`t1`.`s`) > 'ab' +Note 1003 select `test`.`t1`.`s` AS `s` from `test`.`t1` where mariadb_schema.trim(both 'y' from `test`.`t1`.`s`) > 'ab' EXPLAIN EXTENDED SELECT s FROM t1 WHERE TRIM(LEADING 'y' FROM s) > 'ab'; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`s` AS `s` from `test`.`t1` where trim(leading 'y' from `test`.`t1`.`s`) > 'ab' +Note 1003 select `test`.`t1`.`s` AS `s` from `test`.`t1` where mariadb_schema.trim(leading 'y' from `test`.`t1`.`s`) > 'ab' EXPLAIN EXTENDED SELECT s FROM t1 WHERE TRIM(TRAILING 'y' FROM s) > 'ab'; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`s` AS `s` from `test`.`t1` where trim(trailing 'y' from `test`.`t1`.`s`) > 'ab' +Note 1003 select `test`.`t1`.`s` AS `s` from `test`.`t1` where mariadb_schema.trim(trailing 'y' from `test`.`t1`.`s`) > 'ab' EXPLAIN EXTENDED SELECT s FROM t1 WHERE TRIM(BOTH 'y' FROM s) > 'ab'; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`s` AS `s` from `test`.`t1` where trim(both 'y' from `test`.`t1`.`s`) > 'ab' +Note 1003 select `test`.`t1`.`s` AS `s` from `test`.`t1` where mariadb_schema.trim(both 'y' from `test`.`t1`.`s`) > 'ab' DROP TABLE t1; create table t1(f1 varchar(4)); explain extended select encode(f1,'zxcv') as 'enc' from t1; @@ -1348,7 +1348,7 @@ explain extended select decode(f1,'zxcv') as 'enc' from t1; id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 system NULL NULL NULL NULL 0 0.00 Const row not found Warnings: -Note 1003 select decode(NULL,'zxcv') AS `enc` from `test`.`t1` +Note 1003 select mariadb_schema.decode(NULL,'zxcv') AS `enc` from `test`.`t1` drop table t1; create table t1 (a bigint not null)engine=myisam; insert into t1 set a = 1024*1024*1024*4; diff --git a/mysql-test/main/keywords.result b/mysql-test/main/keywords.result index 8db364ac156..1029d4f0966 100644 --- a/mysql-test/main/keywords.result +++ b/mysql-test/main/keywords.result @@ -500,21 +500,21 @@ SELECT @@global.rpad(); -- Unknown system variable 'rpad' -------- SELECT @@global.adddate(); -- Unknown system variable 'adddate' -------- -SELECT @@global.substr(); -- Unknown system variable 'substr' +SELECT @@global.substr(); -- ..syntax.. near 'substr()' at line 1 -------- -SELECT @@global.substring(); -- Unknown system variable 'substring' +SELECT @@global.substring(); -- ..syntax.. near 'substring()' at line 1 -------- SELECT @@global.trim_oracle(); -- Unknown system variable 'trim_oracle' -------- SELECT @@global.ascii(); -- Unknown system variable 'ascii' -------- -SELECT @@global.replace(); -- Unknown system variable 'replace' +SELECT @@global.replace(); -- ..syntax.. near 'replace()' at line 1 -------- SELECT @@global.weight_string(); -- Unknown system variable 'weight_string' -------- SELECT @@global.char(); -- Unknown system variable 'char' -------- -SELECT @@global.trim(); -- Unknown system variable 'trim' +SELECT @@global.trim(); -- ..syntax.. near 'trim()' at line 1 -------- SELECT @@global.year(); -- Unknown system variable 'year' -------- @@ -558,21 +558,21 @@ SELECT test.rpad(); -- FUNCTION test.rpad does not exist -------- SELECT test.adddate(); -- FUNCTION test.adddate does not exist. Ch -------- -SELECT test.substr(); -- FUNCTION test.substr does not exist. Che +SELECT test.substr(); -- ..syntax.. near ')' at line 1 -------- -SELECT test.substring(); -- FUNCTION test.substring does not exist. +SELECT test.substring(); -- ..syntax.. near ')' at line 1 -------- SELECT test.trim_oracle(); -- FUNCTION test.trim_oracle does not exist -------- SELECT test.ascii(); -- FUNCTION test.ascii does not exist. Chec -------- -SELECT test.replace(); -- FUNCTION test.replace does not exist. Ch +SELECT test.replace(); -- ..syntax.. near ')' at line 1 -------- SELECT test.weight_string(); -- FUNCTION test.weight_string does not exi -------- SELECT test.char(); -- FUNCTION test.char does not exist. Check -------- -SELECT test.trim(); -- FUNCTION test.trim does not exist. Check +SELECT test.trim(); -- ..syntax.. near ')' at line 1 -------- SELECT test.year(); -- FUNCTION test.year does not exist. Check -------- @@ -732,21 +732,21 @@ CREATE FUNCTION test.rpad() RETURNS OOPS; -- ..syntax.. near 'OOPS' at line 1 -------- CREATE FUNCTION test.adddate() RETURNS OOPS; -- ..syntax.. near 'OOPS' at line 1 -------- -CREATE FUNCTION test.substr() RETURNS OOPS; -- ..syntax.. near 'OOPS' at line 1 +CREATE FUNCTION test.substr() RETURNS OOPS; -- ..syntax.. near 'substr() RETURNS OOPS' -------- -CREATE FUNCTION test.substring() RETURNS OOPS; -- ..syntax.. near 'OOPS' at line 1 +CREATE FUNCTION test.substring() RETURNS OOPS; -- ..syntax.. near 'substring() RETURNS OOP -------- CREATE FUNCTION test.trim_oracle() RETURNS OOPS; -- ..syntax.. near 'OOPS' at line 1 -------- CREATE FUNCTION test.ascii() RETURNS OOPS; -- ..syntax.. near 'OOPS' at line 1 -------- -CREATE FUNCTION test.replace() RETURNS OOPS; -- ..syntax.. near 'OOPS' at line 1 +CREATE FUNCTION test.replace() RETURNS OOPS; -- ..syntax.. near 'replace() RETURNS OOPS' -------- CREATE FUNCTION test.weight_string() RETURNS OOPS; -- ..syntax.. near 'OOPS' at line 1 -------- CREATE FUNCTION test.char() RETURNS OOPS; -- ..syntax.. near 'OOPS' at line 1 -------- -CREATE FUNCTION test.trim() RETURNS OOPS; -- ..syntax.. near 'OOPS' at line 1 +CREATE FUNCTION test.trim() RETURNS OOPS; -- ..syntax.. near 'trim() RETURNS OOPS' at -------- CREATE FUNCTION test.year() RETURNS OOPS; -- ..syntax.. near 'OOPS' at line 1 -------- diff --git a/mysql-test/main/null.result b/mysql-test/main/null.result index 2671ee2c40c..48850884df9 100644 --- a/mysql-test/main/null.result +++ b/mysql-test/main/null.result @@ -1689,7 +1689,7 @@ SELECT * FROM t1 WHERE a=10 AND NULLIF(a,2011.1)=CONCAT('2011',RAND()); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` = 2010 and (case when 2010 = 2011 then NULL else `test`.`t1`.`a` end) = concat('2011',rand()) +Note 1003 select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` = 2010 and (case when 2010 = 2011 then NULL else `test`.`t1`.`a` end) = mariadb_schema.concat('2011',rand()) DROP TABLE t1; # # MDEV-8754 Wrong result for SELECT..WHERE year_field=2020 AND NULLIF(year_field,2010)='2020' @@ -1716,7 +1716,7 @@ SELECT * FROM t1 WHERE a=2020 AND NULLIF(a,2010)=CONCAT('2020',RAND()); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: -Note 1003 select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` = 2020 and (case when 2020 = 2010 then NULL else `test`.`t1`.`a` end) = concat('2020',rand()) +Note 1003 select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` = 2020 and (case when 2020 = 2010 then NULL else `test`.`t1`.`a` end) = mariadb_schema.concat('2020',rand()) DROP TABLE t1; # # MDEV-9181 (NULLIF(count(table.col)), 0) gives wrong result on 10.1.x diff --git a/mysql-test/main/order_by.result b/mysql-test/main/order_by.result index 19169282fc7..651570f5578 100644 --- a/mysql-test/main/order_by.result +++ b/mysql-test/main/order_by.result @@ -3068,7 +3068,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 PRIMARY t3a ALL NULL NULL NULL NULL 2 100.00 Using where; Start temporary 1 PRIMARY t3b ref f3_key f3_key 6 test.t3a.f3 1 100.00 Using where; End temporary Warnings: -Note 1003 select concat('foo',`test`.`t2`.`f2`) AS `field` from `test`.`t2` semi join ((`test`.`t3` `t3a` join `test`.`t3` `t3b`)) where `test`.`t3a`.`f3` < 'foo' or `test`.`t3b`.`f3` <> 'foo' order by concat('foo',`test`.`t2`.`f2`) +Note 1003 select mariadb_schema.concat('foo',`test`.`t2`.`f2`) AS `field` from `test`.`t2` semi join ((`test`.`t3` `t3a` join `test`.`t3` `t3b`)) where `test`.`t3a`.`f3` < 'foo' or `test`.`t3b`.`f3` <> 'foo' order by mariadb_schema.concat('foo',`test`.`t2`.`f2`) DROP TABLE t1,t2,t3; End of 5.5 tests # diff --git a/mysql-test/main/precedence.result b/mysql-test/main/precedence.result index fc6579651b4..2ae909eed5a 100644 --- a/mysql-test/main/precedence.result +++ b/mysql-test/main/precedence.result @@ -7541,434 +7541,434 @@ set sql_mode=PIPES_AS_CONCAT; create or replace view v1 as select 2 OR 3 || 3, 2 OR (3 || 3), (2 OR 3) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 2 or concat(3,3) AS `2 OR 3 || 3`,2 or concat(3,3) AS `2 OR (3 || 3)`,concat(2 or 3,3) AS `(2 OR 3) || 3` +select 2 or mariadb_schema.concat(3,3) AS `2 OR 3 || 3`,2 or mariadb_schema.concat(3,3) AS `2 OR (3 || 3)`,mariadb_schema.concat(2 or 3,3) AS `(2 OR 3) || 3` select 2 OR 3 || 3, 2 OR (3 || 3), (2 OR 3) || 3 union select * from v1; 2 OR 3 || 3 2 OR (3 || 3) (2 OR 3) || 3 1 1 13 create or replace view v1 as select 2 || 3 OR 3, 2 || (3 OR 3), (2 || 3) OR 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(2,3) or 3 AS `2 || 3 OR 3`,concat(2,3 or 3) AS `2 || (3 OR 3)`,concat(2,3) or 3 AS `(2 || 3) OR 3` +select mariadb_schema.concat(2,3) or 3 AS `2 || 3 OR 3`,mariadb_schema.concat(2,3 or 3) AS `2 || (3 OR 3)`,mariadb_schema.concat(2,3) or 3 AS `(2 || 3) OR 3` select 2 || 3 OR 3, 2 || (3 OR 3), (2 || 3) OR 3 union select * from v1; 2 || 3 OR 3 2 || (3 OR 3) (2 || 3) OR 3 1 21 1 create or replace view v1 as select NOT 2 || 3, NOT (2 || 3), (NOT 2) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select !concat(2,3) AS `NOT 2 || 3`,!concat(2,3) AS `NOT (2 || 3)`,concat(!2,3) AS `(NOT 2) || 3` +select !mariadb_schema.concat(2,3) AS `NOT 2 || 3`,!mariadb_schema.concat(2,3) AS `NOT (2 || 3)`,mariadb_schema.concat(!2,3) AS `(NOT 2) || 3` select NOT 2 || 3, NOT (2 || 3), (NOT 2) || 3 union select * from v1; NOT 2 || 3 NOT (2 || 3) (NOT 2) || 3 0 0 03 create or replace view v1 as select - '2 ' || 3, - ('2 ' || 3), (- '2 ') || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(-'2 ',3) AS `- '2 ' || 3`,-concat('2 ',3) AS `- ('2 ' || 3)`,concat(-'2 ',3) AS `(- '2 ') || 3` +select mariadb_schema.concat(-'2 ',3) AS `- '2 ' || 3`,-mariadb_schema.concat('2 ',3) AS `- ('2 ' || 3)`,mariadb_schema.concat(-'2 ',3) AS `(- '2 ') || 3` select - '2 ' || 3, - ('2 ' || 3), (- '2 ') || 3 union select * from v1; - '2 ' || 3 - ('2 ' || 3) (- '2 ') || 3 -23 -2 -23 create or replace view v1 as select ~ 2 || 3, ~ (2 || 3), (~ 2) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(~2,3) AS `~ 2 || 3`,~concat(2,3) AS `~ (2 || 3)`,concat(~2,3) AS `(~ 2) || 3` +select mariadb_schema.concat(~2,3) AS `~ 2 || 3`,~mariadb_schema.concat(2,3) AS `~ (2 || 3)`,mariadb_schema.concat(~2,3) AS `(~ 2) || 3` select ~ 2 || 3, ~ (2 || 3), (~ 2) || 3 union select * from v1; ~ 2 || 3 ~ (2 || 3) (~ 2) || 3 184467440737095516133 18446744073709551592 184467440737095516133 create or replace view v1 as select ! 2 || 3, ! (2 || 3), (! 2) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(!2,3) AS `! 2 || 3`,!concat(2,3) AS `! (2 || 3)`,concat(!2,3) AS `(! 2) || 3` +select mariadb_schema.concat(!2,3) AS `! 2 || 3`,!mariadb_schema.concat(2,3) AS `! (2 || 3)`,mariadb_schema.concat(!2,3) AS `(! 2) || 3` select ! 2 || 3, ! (2 || 3), (! 2) || 3 union select * from v1; ! 2 || 3 ! (2 || 3) (! 2) || 3 03 0 03 create or replace view v1 as select 2 || 3 IS FALSE, 2 || (3 IS FALSE), (2 || 3) IS FALSE; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(2,3) is false AS `2 || 3 IS FALSE`,concat(2,3 is false) AS `2 || (3 IS FALSE)`,concat(2,3) is false AS `(2 || 3) IS FALSE` +select mariadb_schema.concat(2,3) is false AS `2 || 3 IS FALSE`,mariadb_schema.concat(2,3 is false) AS `2 || (3 IS FALSE)`,mariadb_schema.concat(2,3) is false AS `(2 || 3) IS FALSE` select 2 || 3 IS FALSE, 2 || (3 IS FALSE), (2 || 3) IS FALSE union select * from v1; 2 || 3 IS FALSE 2 || (3 IS FALSE) (2 || 3) IS FALSE 0 20 0 create or replace view v1 as select 0 || 3 IN (3,10), 0 || (3 IN (3,10)), (0 || 3) IN (3,10); Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(0,3) in (3,10) AS `0 || 3 IN (3,10)`,concat(0,3 in (3,10)) AS `0 || (3 IN (3,10))`,concat(0,3) in (3,10) AS `(0 || 3) IN (3,10)` +select mariadb_schema.concat(0,3) in (3,10) AS `0 || 3 IN (3,10)`,mariadb_schema.concat(0,3 in (3,10)) AS `0 || (3 IN (3,10))`,mariadb_schema.concat(0,3) in (3,10) AS `(0 || 3) IN (3,10)` select 0 || 3 IN (3,10), 0 || (3 IN (3,10)), (0 || 3) IN (3,10) union select * from v1; 0 || 3 IN (3,10) 0 || (3 IN (3,10)) (0 || 3) IN (3,10) 1 01 1 create or replace view v1 as select 1 || 0 XOR 1, 1 || (0 XOR 1), (1 || 0) XOR 1; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(1,0) xor 1 AS `1 || 0 XOR 1`,concat(1,0 xor 1) AS `1 || (0 XOR 1)`,concat(1,0) xor 1 AS `(1 || 0) XOR 1` +select mariadb_schema.concat(1,0) xor 1 AS `1 || 0 XOR 1`,mariadb_schema.concat(1,0 xor 1) AS `1 || (0 XOR 1)`,mariadb_schema.concat(1,0) xor 1 AS `(1 || 0) XOR 1` select 1 || 0 XOR 1, 1 || (0 XOR 1), (1 || 0) XOR 1 union select * from v1; 1 || 0 XOR 1 1 || (0 XOR 1) (1 || 0) XOR 1 0 11 0 create or replace view v1 as select 1 || 1 AND 0, 1 || (1 AND 0), (1 || 1) AND 0; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(1,1) and 0 AS `1 || 1 AND 0`,concat(1,1 and 0) AS `1 || (1 AND 0)`,concat(1,1) and 0 AS `(1 || 1) AND 0` +select mariadb_schema.concat(1,1) and 0 AS `1 || 1 AND 0`,mariadb_schema.concat(1,1 and 0) AS `1 || (1 AND 0)`,mariadb_schema.concat(1,1) and 0 AS `(1 || 1) AND 0` select 1 || 1 AND 0, 1 || (1 AND 0), (1 || 1) AND 0 union select * from v1; 1 || 1 AND 0 1 || (1 AND 0) (1 || 1) AND 0 0 10 0 create or replace view v1 as select 1 || 1 && 0, 1 || (1 && 0), (1 || 1) && 0; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(1,1) and 0 AS `1 || 1 && 0`,concat(1,1 and 0) AS `1 || (1 && 0)`,concat(1,1) and 0 AS `(1 || 1) && 0` +select mariadb_schema.concat(1,1) and 0 AS `1 || 1 && 0`,mariadb_schema.concat(1,1 and 0) AS `1 || (1 && 0)`,mariadb_schema.concat(1,1) and 0 AS `(1 || 1) && 0` select 1 || 1 && 0, 1 || (1 && 0), (1 || 1) && 0 union select * from v1; 1 || 1 && 0 1 || (1 && 0) (1 || 1) && 0 0 10 0 create or replace view v1 as select 2 || 3 = 3, 2 || (3 = 3), (2 || 3) = 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(2,3) = 3 AS `2 || 3 = 3`,concat(2,3 = 3) AS `2 || (3 = 3)`,concat(2,3) = 3 AS `(2 || 3) = 3` +select mariadb_schema.concat(2,3) = 3 AS `2 || 3 = 3`,mariadb_schema.concat(2,3 = 3) AS `2 || (3 = 3)`,mariadb_schema.concat(2,3) = 3 AS `(2 || 3) = 3` select 2 || 3 = 3, 2 || (3 = 3), (2 || 3) = 3 union select * from v1; 2 || 3 = 3 2 || (3 = 3) (2 || 3) = 3 0 21 0 create or replace view v1 as select 2 || 3 <=> 3, 2 || (3 <=> 3), (2 || 3) <=> 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(2,3) <=> 3 AS `2 || 3 <=> 3`,concat(2,3 <=> 3) AS `2 || (3 <=> 3)`,concat(2,3) <=> 3 AS `(2 || 3) <=> 3` +select mariadb_schema.concat(2,3) <=> 3 AS `2 || 3 <=> 3`,mariadb_schema.concat(2,3 <=> 3) AS `2 || (3 <=> 3)`,mariadb_schema.concat(2,3) <=> 3 AS `(2 || 3) <=> 3` select 2 || 3 <=> 3, 2 || (3 <=> 3), (2 || 3) <=> 3 union select * from v1; 2 || 3 <=> 3 2 || (3 <=> 3) (2 || 3) <=> 3 0 21 0 create or replace view v1 as select 2 || 3 >= 3, 2 || (3 >= 3), (2 || 3) >= 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(2,3) >= 3 AS `2 || 3 >= 3`,concat(2,3 >= 3) AS `2 || (3 >= 3)`,concat(2,3) >= 3 AS `(2 || 3) >= 3` +select mariadb_schema.concat(2,3) >= 3 AS `2 || 3 >= 3`,mariadb_schema.concat(2,3 >= 3) AS `2 || (3 >= 3)`,mariadb_schema.concat(2,3) >= 3 AS `(2 || 3) >= 3` select 2 || 3 >= 3, 2 || (3 >= 3), (2 || 3) >= 3 union select * from v1; 2 || 3 >= 3 2 || (3 >= 3) (2 || 3) >= 3 1 21 1 create or replace view v1 as select 2 || 3 <= 0, 2 || (3 <= 0), (2 || 3) <= 0; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(2,3) <= 0 AS `2 || 3 <= 0`,concat(2,3 <= 0) AS `2 || (3 <= 0)`,concat(2,3) <= 0 AS `(2 || 3) <= 0` +select mariadb_schema.concat(2,3) <= 0 AS `2 || 3 <= 0`,mariadb_schema.concat(2,3 <= 0) AS `2 || (3 <= 0)`,mariadb_schema.concat(2,3) <= 0 AS `(2 || 3) <= 0` select 2 || 3 <= 0, 2 || (3 <= 0), (2 || 3) <= 0 union select * from v1; 2 || 3 <= 0 2 || (3 <= 0) (2 || 3) <= 0 0 20 0 create or replace view v1 as select 2 || 3 < 0, 2 || (3 < 0), (2 || 3) < 0; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(2,3) < 0 AS `2 || 3 < 0`,concat(2,3 < 0) AS `2 || (3 < 0)`,concat(2,3) < 0 AS `(2 || 3) < 0` +select mariadb_schema.concat(2,3) < 0 AS `2 || 3 < 0`,mariadb_schema.concat(2,3 < 0) AS `2 || (3 < 0)`,mariadb_schema.concat(2,3) < 0 AS `(2 || 3) < 0` select 2 || 3 < 0, 2 || (3 < 0), (2 || 3) < 0 union select * from v1; 2 || 3 < 0 2 || (3 < 0) (2 || 3) < 0 0 20 0 create or replace view v1 as select 0 || 3 <> 3, 0 || (3 <> 3), (0 || 3) <> 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(0,3) <> 3 AS `0 || 3 <> 3`,concat(0,3 <> 3) AS `0 || (3 <> 3)`,concat(0,3) <> 3 AS `(0 || 3) <> 3` +select mariadb_schema.concat(0,3) <> 3 AS `0 || 3 <> 3`,mariadb_schema.concat(0,3 <> 3) AS `0 || (3 <> 3)`,mariadb_schema.concat(0,3) <> 3 AS `(0 || 3) <> 3` select 0 || 3 <> 3, 0 || (3 <> 3), (0 || 3) <> 3 union select * from v1; 0 || 3 <> 3 0 || (3 <> 3) (0 || 3) <> 3 0 00 0 create or replace view v1 as select 2 || 3 > 3, 2 || (3 > 3), (2 || 3) > 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(2,3) > 3 AS `2 || 3 > 3`,concat(2,3 > 3) AS `2 || (3 > 3)`,concat(2,3) > 3 AS `(2 || 3) > 3` +select mariadb_schema.concat(2,3) > 3 AS `2 || 3 > 3`,mariadb_schema.concat(2,3 > 3) AS `2 || (3 > 3)`,mariadb_schema.concat(2,3) > 3 AS `(2 || 3) > 3` select 2 || 3 > 3, 2 || (3 > 3), (2 || 3) > 3 union select * from v1; 2 || 3 > 3 2 || (3 > 3) (2 || 3) > 3 1 20 1 create or replace view v1 as select 0 || 3 != 3, 0 || (3 != 3), (0 || 3) != 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(0,3) <> 3 AS `0 || 3 != 3`,concat(0,3 <> 3) AS `0 || (3 != 3)`,concat(0,3) <> 3 AS `(0 || 3) != 3` +select mariadb_schema.concat(0,3) <> 3 AS `0 || 3 != 3`,mariadb_schema.concat(0,3 <> 3) AS `0 || (3 != 3)`,mariadb_schema.concat(0,3) <> 3 AS `(0 || 3) != 3` select 0 || 3 != 3, 0 || (3 != 3), (0 || 3) != 3 union select * from v1; 0 || 3 != 3 0 || (3 != 3) (0 || 3) != 3 0 00 0 create or replace view v1 as select 2 || 3 LIKE 3, 2 || (3 LIKE 3), (2 || 3) LIKE 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(2,3) like 3 AS `2 || 3 LIKE 3`,concat(2,3 like 3) AS `2 || (3 LIKE 3)`,concat(2,3) like 3 AS `(2 || 3) LIKE 3` +select mariadb_schema.concat(2,3) like 3 AS `2 || 3 LIKE 3`,mariadb_schema.concat(2,3 like 3) AS `2 || (3 LIKE 3)`,mariadb_schema.concat(2,3) like 3 AS `(2 || 3) LIKE 3` select 2 || 3 LIKE 3, 2 || (3 LIKE 3), (2 || 3) LIKE 3 union select * from v1; 2 || 3 LIKE 3 2 || (3 LIKE 3) (2 || 3) LIKE 3 0 21 0 create or replace view v1 as select 2 || 3 REGEXP 3, 2 || (3 REGEXP 3), (2 || 3) REGEXP 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(2,3) regexp 3 AS `2 || 3 REGEXP 3`,concat(2,3 regexp 3) AS `2 || (3 REGEXP 3)`,concat(2,3) regexp 3 AS `(2 || 3) REGEXP 3` +select mariadb_schema.concat(2,3) regexp 3 AS `2 || 3 REGEXP 3`,mariadb_schema.concat(2,3 regexp 3) AS `2 || (3 REGEXP 3)`,mariadb_schema.concat(2,3) regexp 3 AS `(2 || 3) REGEXP 3` select 2 || 3 REGEXP 3, 2 || (3 REGEXP 3), (2 || 3) REGEXP 3 union select * from v1; 2 || 3 REGEXP 3 2 || (3 REGEXP 3) (2 || 3) REGEXP 3 1 21 1 create or replace view v1 as select 2 || ' 3' | 3, 2 || (' 3' | 3), (2 || ' 3') | 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(2,' 3') | 3 AS `2 || ' 3' | 3`,concat(2,' 3' | 3) AS `2 || (' 3' | 3)`,concat(2,' 3') | 3 AS `(2 || ' 3') | 3` +select mariadb_schema.concat(2,' 3') | 3 AS `2 || ' 3' | 3`,mariadb_schema.concat(2,' 3' | 3) AS `2 || (' 3' | 3)`,mariadb_schema.concat(2,' 3') | 3 AS `(2 || ' 3') | 3` select 2 || ' 3' | 3, 2 || (' 3' | 3), (2 || ' 3') | 3 union select * from v1; 2 || ' 3' | 3 2 || (' 3' | 3) (2 || ' 3') | 3 3 23 3 create or replace view v1 as select 0 || 2 & 2, 0 || (2 & 2), (0 || 2) & 2; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(0,2) & 2 AS `0 || 2 & 2`,concat(0,2 & 2) AS `0 || (2 & 2)`,concat(0,2) & 2 AS `(0 || 2) & 2` +select mariadb_schema.concat(0,2) & 2 AS `0 || 2 & 2`,mariadb_schema.concat(0,2 & 2) AS `0 || (2 & 2)`,mariadb_schema.concat(0,2) & 2 AS `(0 || 2) & 2` select 0 || 2 & 2, 0 || (2 & 2), (0 || 2) & 2 union select * from v1; 0 || 2 & 2 0 || (2 & 2) (0 || 2) & 2 2 02 2 create or replace view v1 as select 2 || 3 << 3, 2 || (3 << 3), (2 || 3) << 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(2,3) << 3 AS `2 || 3 << 3`,concat(2,3 << 3) AS `2 || (3 << 3)`,concat(2,3) << 3 AS `(2 || 3) << 3` +select mariadb_schema.concat(2,3) << 3 AS `2 || 3 << 3`,mariadb_schema.concat(2,3 << 3) AS `2 || (3 << 3)`,mariadb_schema.concat(2,3) << 3 AS `(2 || 3) << 3` select 2 || 3 << 3, 2 || (3 << 3), (2 || 3) << 3 union select * from v1; 2 || 3 << 3 2 || (3 << 3) (2 || 3) << 3 184 224 184 create or replace view v1 as select 2 || 3 >> 3, 2 || (3 >> 3), (2 || 3) >> 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(2,3) >> 3 AS `2 || 3 >> 3`,concat(2,3 >> 3) AS `2 || (3 >> 3)`,concat(2,3) >> 3 AS `(2 || 3) >> 3` +select mariadb_schema.concat(2,3) >> 3 AS `2 || 3 >> 3`,mariadb_schema.concat(2,3 >> 3) AS `2 || (3 >> 3)`,mariadb_schema.concat(2,3) >> 3 AS `(2 || 3) >> 3` select 2 || 3 >> 3, 2 || (3 >> 3), (2 || 3) >> 3 union select * from v1; 2 || 3 >> 3 2 || (3 >> 3) (2 || 3) >> 3 2 20 2 create or replace view v1 as select 2 || '2000-01-01' +INTERVAL 1 DAY, 2 || ('2000-01-01' +INTERVAL 1 DAY), (2 || '2000-01-01') +INTERVAL 1 DAY; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(2,'2000-01-01') + interval 1 day AS `2 || '2000-01-01' +INTERVAL 1 DAY`,concat(2,'2000-01-01' + interval 1 day) AS `2 || ('2000-01-01' +INTERVAL 1 DAY)`,concat(2,'2000-01-01') + interval 1 day AS `(2 || '2000-01-01') +INTERVAL 1 DAY` +select mariadb_schema.concat(2,'2000-01-01') + interval 1 day AS `2 || '2000-01-01' +INTERVAL 1 DAY`,mariadb_schema.concat(2,'2000-01-01' + interval 1 day) AS `2 || ('2000-01-01' +INTERVAL 1 DAY)`,mariadb_schema.concat(2,'2000-01-01') + interval 1 day AS `(2 || '2000-01-01') +INTERVAL 1 DAY` select 2 || '2000-01-01' +INTERVAL 1 DAY, 2 || ('2000-01-01' +INTERVAL 1 DAY), (2 || '2000-01-01') +INTERVAL 1 DAY union select * from v1; 2 || '2000-01-01' +INTERVAL 1 DAY 2 || ('2000-01-01' +INTERVAL 1 DAY) (2 || '2000-01-01') +INTERVAL 1 DAY NULL 22000-01-02 NULL create or replace view v1 as select 2 || ' 3' + 3, 2 || (' 3' + 3), (2 || ' 3') + 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(2,' 3') + 3 AS `2 || ' 3' + 3`,concat(2,' 3' + 3) AS `2 || (' 3' + 3)`,concat(2,' 3') + 3 AS `(2 || ' 3') + 3` +select mariadb_schema.concat(2,' 3') + 3 AS `2 || ' 3' + 3`,mariadb_schema.concat(2,' 3' + 3) AS `2 || (' 3' + 3)`,mariadb_schema.concat(2,' 3') + 3 AS `(2 || ' 3') + 3` select 2 || ' 3' + 3, 2 || (' 3' + 3), (2 || ' 3') + 3 union select * from v1; 2 || ' 3' + 3 2 || (' 3' + 3) (2 || ' 3') + 3 5 26 5 create or replace view v1 as select 2 || ' 3' - 3, 2 || (' 3' - 3), (2 || ' 3') - 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(2,' 3') - 3 AS `2 || ' 3' - 3`,concat(2,' 3' - 3) AS `2 || (' 3' - 3)`,concat(2,' 3') - 3 AS `(2 || ' 3') - 3` +select mariadb_schema.concat(2,' 3') - 3 AS `2 || ' 3' - 3`,mariadb_schema.concat(2,' 3' - 3) AS `2 || (' 3' - 3)`,mariadb_schema.concat(2,' 3') - 3 AS `(2 || ' 3') - 3` select 2 || ' 3' - 3, 2 || (' 3' - 3), (2 || ' 3') - 3 union select * from v1; 2 || ' 3' - 3 2 || (' 3' - 3) (2 || ' 3') - 3 -1 20 -1 create or replace view v1 as select 2 || 3 * 3, 2 || (3 * 3), (2 || 3) * 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(2,3) * 3 AS `2 || 3 * 3`,concat(2,3 * 3) AS `2 || (3 * 3)`,concat(2,3) * 3 AS `(2 || 3) * 3` +select mariadb_schema.concat(2,3) * 3 AS `2 || 3 * 3`,mariadb_schema.concat(2,3 * 3) AS `2 || (3 * 3)`,mariadb_schema.concat(2,3) * 3 AS `(2 || 3) * 3` select 2 || 3 * 3, 2 || (3 * 3), (2 || 3) * 3 union select * from v1; 2 || 3 * 3 2 || (3 * 3) (2 || 3) * 3 69 29 69 create or replace view v1 as select 2 || 3 / 3, 2 || (3 / 3), (2 || 3) / 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(2,3) / 3 AS `2 || 3 / 3`,concat(2,3 / 3) AS `2 || (3 / 3)`,concat(2,3) / 3 AS `(2 || 3) / 3` +select mariadb_schema.concat(2,3) / 3 AS `2 || 3 / 3`,mariadb_schema.concat(2,3 / 3) AS `2 || (3 / 3)`,mariadb_schema.concat(2,3) / 3 AS `(2 || 3) / 3` select 2 || 3 / 3, 2 || (3 / 3), (2 || 3) / 3 union select * from v1; 2 || 3 / 3 2 || (3 / 3) (2 || 3) / 3 7.666666666666667 21.0000 7.666666666666667 create or replace view v1 as select 2 || 3 DIV 3, 2 || (3 DIV 3), (2 || 3) DIV 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(2,3) DIV 3 AS `2 || 3 DIV 3`,concat(2,3 DIV 3) AS `2 || (3 DIV 3)`,concat(2,3) DIV 3 AS `(2 || 3) DIV 3` +select mariadb_schema.concat(2,3) DIV 3 AS `2 || 3 DIV 3`,mariadb_schema.concat(2,3 DIV 3) AS `2 || (3 DIV 3)`,mariadb_schema.concat(2,3) DIV 3 AS `(2 || 3) DIV 3` select 2 || 3 DIV 3, 2 || (3 DIV 3), (2 || 3) DIV 3 union select * from v1; 2 || 3 DIV 3 2 || (3 DIV 3) (2 || 3) DIV 3 7 21 7 create or replace view v1 as select 0 || 3 MOD 3, 0 || (3 MOD 3), (0 || 3) MOD 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(0,3) MOD 3 AS `0 || 3 MOD 3`,concat(0,3 MOD 3) AS `0 || (3 MOD 3)`,concat(0,3) MOD 3 AS `(0 || 3) MOD 3` +select mariadb_schema.concat(0,3) MOD 3 AS `0 || 3 MOD 3`,mariadb_schema.concat(0,3 MOD 3) AS `0 || (3 MOD 3)`,mariadb_schema.concat(0,3) MOD 3 AS `(0 || 3) MOD 3` select 0 || 3 MOD 3, 0 || (3 MOD 3), (0 || 3) MOD 3 union select * from v1; 0 || 3 MOD 3 0 || (3 MOD 3) (0 || 3) MOD 3 0 00 0 create or replace view v1 as select 0 || 3 % 3, 0 || (3 % 3), (0 || 3) % 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(0,3) MOD 3 AS `0 || 3 % 3`,concat(0,3 MOD 3) AS `0 || (3 % 3)`,concat(0,3) MOD 3 AS `(0 || 3) % 3` +select mariadb_schema.concat(0,3) MOD 3 AS `0 || 3 % 3`,mariadb_schema.concat(0,3 MOD 3) AS `0 || (3 % 3)`,mariadb_schema.concat(0,3) MOD 3 AS `(0 || 3) % 3` select 0 || 3 % 3, 0 || (3 % 3), (0 || 3) % 3 union select * from v1; 0 || 3 % 3 0 || (3 % 3) (0 || 3) % 3 0 00 0 create or replace view v1 as select 2 || ' 3' ^ 3, 2 || (' 3' ^ 3), (2 || ' 3') ^ 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(2,' 3') ^ 3 AS `2 || ' 3' ^ 3`,concat(2,' 3' ^ 3) AS `2 || (' 3' ^ 3)`,concat(2,' 3') ^ 3 AS `(2 || ' 3') ^ 3` +select mariadb_schema.concat(2,' 3') ^ 3 AS `2 || ' 3' ^ 3`,mariadb_schema.concat(2,' 3' ^ 3) AS `2 || (' 3' ^ 3)`,mariadb_schema.concat(2,' 3') ^ 3 AS `(2 || ' 3') ^ 3` select 2 || ' 3' ^ 3, 2 || (' 3' ^ 3), (2 || ' 3') ^ 3 union select * from v1; 2 || ' 3' ^ 3 2 || (' 3' ^ 3) (2 || ' 3') ^ 3 1 20 1 create or replace view v1 as select 2 || 3 BETWEEN 2 AND 3, 2 || (3 BETWEEN 2 AND 3), (2 || 3) BETWEEN 2 AND 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select concat(2,3) between 2 and 3 AS `2 || 3 BETWEEN 2 AND 3`,concat(2,3 between 2 and 3) AS `2 || (3 BETWEEN 2 AND 3)`,concat(2,3) between 2 and 3 AS `(2 || 3) BETWEEN 2 AND 3` +select mariadb_schema.concat(2,3) between 2 and 3 AS `2 || 3 BETWEEN 2 AND 3`,mariadb_schema.concat(2,3 between 2 and 3) AS `2 || (3 BETWEEN 2 AND 3)`,mariadb_schema.concat(2,3) between 2 and 3 AS `(2 || 3) BETWEEN 2 AND 3` select 2 || 3 BETWEEN 2 AND 3, 2 || (3 BETWEEN 2 AND 3), (2 || 3) BETWEEN 2 AND 3 union select * from v1; 2 || 3 BETWEEN 2 AND 3 2 || (3 BETWEEN 2 AND 3) (2 || 3) BETWEEN 2 AND 3 0 21 0 create or replace view v1 as select 2 XOR 3 || 3, 2 XOR (3 || 3), (2 XOR 3) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 2 xor concat(3,3) AS `2 XOR 3 || 3`,2 xor concat(3,3) AS `2 XOR (3 || 3)`,concat(2 xor 3,3) AS `(2 XOR 3) || 3` +select 2 xor mariadb_schema.concat(3,3) AS `2 XOR 3 || 3`,2 xor mariadb_schema.concat(3,3) AS `2 XOR (3 || 3)`,mariadb_schema.concat(2 xor 3,3) AS `(2 XOR 3) || 3` select 2 XOR 3 || 3, 2 XOR (3 || 3), (2 XOR 3) || 3 union select * from v1; 2 XOR 3 || 3 2 XOR (3 || 3) (2 XOR 3) || 3 0 0 03 create or replace view v1 as select 0 AND 3 || 3, 0 AND (3 || 3), (0 AND 3) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 0 and concat(3,3) AS `0 AND 3 || 3`,0 and concat(3,3) AS `0 AND (3 || 3)`,concat(0 and 3,3) AS `(0 AND 3) || 3` +select 0 and mariadb_schema.concat(3,3) AS `0 AND 3 || 3`,0 and mariadb_schema.concat(3,3) AS `0 AND (3 || 3)`,mariadb_schema.concat(0 and 3,3) AS `(0 AND 3) || 3` select 0 AND 3 || 3, 0 AND (3 || 3), (0 AND 3) || 3 union select * from v1; 0 AND 3 || 3 0 AND (3 || 3) (0 AND 3) || 3 0 0 03 create or replace view v1 as select 0 && 3 || 3, 0 && (3 || 3), (0 && 3) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 0 and concat(3,3) AS `0 && 3 || 3`,0 and concat(3,3) AS `0 && (3 || 3)`,concat(0 and 3,3) AS `(0 && 3) || 3` +select 0 and mariadb_schema.concat(3,3) AS `0 && 3 || 3`,0 and mariadb_schema.concat(3,3) AS `0 && (3 || 3)`,mariadb_schema.concat(0 and 3,3) AS `(0 && 3) || 3` select 0 && 3 || 3, 0 && (3 || 3), (0 && 3) || 3 union select * from v1; 0 && 3 || 3 0 && (3 || 3) (0 && 3) || 3 0 0 03 create or replace view v1 as select 2 = 3 || 3, 2 = (3 || 3), (2 = 3) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 2 = concat(3,3) AS `2 = 3 || 3`,2 = concat(3,3) AS `2 = (3 || 3)`,concat(2 = 3,3) AS `(2 = 3) || 3` +select 2 = mariadb_schema.concat(3,3) AS `2 = 3 || 3`,2 = mariadb_schema.concat(3,3) AS `2 = (3 || 3)`,mariadb_schema.concat(2 = 3,3) AS `(2 = 3) || 3` select 2 = 3 || 3, 2 = (3 || 3), (2 = 3) || 3 union select * from v1; 2 = 3 || 3 2 = (3 || 3) (2 = 3) || 3 0 0 03 create or replace view v1 as select 2 <=> 3 || 3, 2 <=> (3 || 3), (2 <=> 3) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 2 <=> concat(3,3) AS `2 <=> 3 || 3`,2 <=> concat(3,3) AS `2 <=> (3 || 3)`,concat(2 <=> 3,3) AS `(2 <=> 3) || 3` +select 2 <=> mariadb_schema.concat(3,3) AS `2 <=> 3 || 3`,2 <=> mariadb_schema.concat(3,3) AS `2 <=> (3 || 3)`,mariadb_schema.concat(2 <=> 3,3) AS `(2 <=> 3) || 3` select 2 <=> 3 || 3, 2 <=> (3 || 3), (2 <=> 3) || 3 union select * from v1; 2 <=> 3 || 3 2 <=> (3 || 3) (2 <=> 3) || 3 0 0 03 create or replace view v1 as select 2 >= 3 || 0, 2 >= (3 || 0), (2 >= 3) || 0; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 2 >= concat(3,0) AS `2 >= 3 || 0`,2 >= concat(3,0) AS `2 >= (3 || 0)`,concat(2 >= 3,0) AS `(2 >= 3) || 0` +select 2 >= mariadb_schema.concat(3,0) AS `2 >= 3 || 0`,2 >= mariadb_schema.concat(3,0) AS `2 >= (3 || 0)`,mariadb_schema.concat(2 >= 3,0) AS `(2 >= 3) || 0` select 2 >= 3 || 0, 2 >= (3 || 0), (2 >= 3) || 0 union select * from v1; 2 >= 3 || 0 2 >= (3 || 0) (2 >= 3) || 0 0 0 00 create or replace view v1 as select 2 <= 3 || 3, 2 <= (3 || 3), (2 <= 3) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 2 <= concat(3,3) AS `2 <= 3 || 3`,2 <= concat(3,3) AS `2 <= (3 || 3)`,concat(2 <= 3,3) AS `(2 <= 3) || 3` +select 2 <= mariadb_schema.concat(3,3) AS `2 <= 3 || 3`,2 <= mariadb_schema.concat(3,3) AS `2 <= (3 || 3)`,mariadb_schema.concat(2 <= 3,3) AS `(2 <= 3) || 3` select 2 <= 3 || 3, 2 <= (3 || 3), (2 <= 3) || 3 union select * from v1; 2 <= 3 || 3 2 <= (3 || 3) (2 <= 3) || 3 1 1 13 create or replace view v1 as select 2 < 3 || 3, 2 < (3 || 3), (2 < 3) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 2 < concat(3,3) AS `2 < 3 || 3`,2 < concat(3,3) AS `2 < (3 || 3)`,concat(2 < 3,3) AS `(2 < 3) || 3` +select 2 < mariadb_schema.concat(3,3) AS `2 < 3 || 3`,2 < mariadb_schema.concat(3,3) AS `2 < (3 || 3)`,mariadb_schema.concat(2 < 3,3) AS `(2 < 3) || 3` select 2 < 3 || 3, 2 < (3 || 3), (2 < 3) || 3 union select * from v1; 2 < 3 || 3 2 < (3 || 3) (2 < 3) || 3 1 1 13 create or replace view v1 as select 1 <> 3 || 3, 1 <> (3 || 3), (1 <> 3) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 1 <> concat(3,3) AS `1 <> 3 || 3`,1 <> concat(3,3) AS `1 <> (3 || 3)`,concat(1 <> 3,3) AS `(1 <> 3) || 3` +select 1 <> mariadb_schema.concat(3,3) AS `1 <> 3 || 3`,1 <> mariadb_schema.concat(3,3) AS `1 <> (3 || 3)`,mariadb_schema.concat(1 <> 3,3) AS `(1 <> 3) || 3` select 1 <> 3 || 3, 1 <> (3 || 3), (1 <> 3) || 3 union select * from v1; 1 <> 3 || 3 1 <> (3 || 3) (1 <> 3) || 3 1 1 13 create or replace view v1 as select 0 > 3 || 3, 0 > (3 || 3), (0 > 3) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 0 > concat(3,3) AS `0 > 3 || 3`,0 > concat(3,3) AS `0 > (3 || 3)`,concat(0 > 3,3) AS `(0 > 3) || 3` +select 0 > mariadb_schema.concat(3,3) AS `0 > 3 || 3`,0 > mariadb_schema.concat(3,3) AS `0 > (3 || 3)`,mariadb_schema.concat(0 > 3,3) AS `(0 > 3) || 3` select 0 > 3 || 3, 0 > (3 || 3), (0 > 3) || 3 union select * from v1; 0 > 3 || 3 0 > (3 || 3) (0 > 3) || 3 0 0 03 create or replace view v1 as select 1 != 3 || 3, 1 != (3 || 3), (1 != 3) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 1 <> concat(3,3) AS `1 != 3 || 3`,1 <> concat(3,3) AS `1 != (3 || 3)`,concat(1 <> 3,3) AS `(1 != 3) || 3` +select 1 <> mariadb_schema.concat(3,3) AS `1 != 3 || 3`,1 <> mariadb_schema.concat(3,3) AS `1 != (3 || 3)`,mariadb_schema.concat(1 <> 3,3) AS `(1 != 3) || 3` select 1 != 3 || 3, 1 != (3 || 3), (1 != 3) || 3 union select * from v1; 1 != 3 || 3 1 != (3 || 3) (1 != 3) || 3 1 1 13 create or replace view v1 as select 2 LIKE 3 || 3, 2 LIKE (3 || 3), (2 LIKE 3) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 2 like concat(3,3) AS `2 LIKE 3 || 3`,2 like concat(3,3) AS `2 LIKE (3 || 3)`,concat(2 like 3,3) AS `(2 LIKE 3) || 3` +select 2 like mariadb_schema.concat(3,3) AS `2 LIKE 3 || 3`,2 like mariadb_schema.concat(3,3) AS `2 LIKE (3 || 3)`,mariadb_schema.concat(2 like 3,3) AS `(2 LIKE 3) || 3` select 2 LIKE 3 || 3, 2 LIKE (3 || 3), (2 LIKE 3) || 3 union select * from v1; 2 LIKE 3 || 3 2 LIKE (3 || 3) (2 LIKE 3) || 3 0 0 03 create or replace view v1 as select 2 REGEXP 3 || 3, 2 REGEXP (3 || 3), (2 REGEXP 3) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 2 regexp concat(3,3) AS `2 REGEXP 3 || 3`,2 regexp concat(3,3) AS `2 REGEXP (3 || 3)`,concat(2 regexp 3,3) AS `(2 REGEXP 3) || 3` +select 2 regexp mariadb_schema.concat(3,3) AS `2 REGEXP 3 || 3`,2 regexp mariadb_schema.concat(3,3) AS `2 REGEXP (3 || 3)`,mariadb_schema.concat(2 regexp 3,3) AS `(2 REGEXP 3) || 3` select 2 REGEXP 3 || 3, 2 REGEXP (3 || 3), (2 REGEXP 3) || 3 union select * from v1; 2 REGEXP 3 || 3 2 REGEXP (3 || 3) (2 REGEXP 3) || 3 0 0 03 create or replace view v1 as select 2 | 3 || 3, 2 | (3 || 3), (2 | 3) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 2 | concat(3,3) AS `2 | 3 || 3`,2 | concat(3,3) AS `2 | (3 || 3)`,concat(2 | 3,3) AS `(2 | 3) || 3` +select 2 | mariadb_schema.concat(3,3) AS `2 | 3 || 3`,2 | mariadb_schema.concat(3,3) AS `2 | (3 || 3)`,mariadb_schema.concat(2 | 3,3) AS `(2 | 3) || 3` select 2 | 3 || 3, 2 | (3 || 3), (2 | 3) || 3 union select * from v1; 2 | 3 || 3 2 | (3 || 3) (2 | 3) || 3 35 35 33 create or replace view v1 as select 2 & 3 || 3, 2 & (3 || 3), (2 & 3) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 2 & concat(3,3) AS `2 & 3 || 3`,2 & concat(3,3) AS `2 & (3 || 3)`,concat(2 & 3,3) AS `(2 & 3) || 3` +select 2 & mariadb_schema.concat(3,3) AS `2 & 3 || 3`,2 & mariadb_schema.concat(3,3) AS `2 & (3 || 3)`,mariadb_schema.concat(2 & 3,3) AS `(2 & 3) || 3` select 2 & 3 || 3, 2 & (3 || 3), (2 & 3) || 3 union select * from v1; 2 & 3 || 3 2 & (3 || 3) (2 & 3) || 3 0 0 23 create or replace view v1 as select 2 << 3 || 3, 2 << (3 || 3), (2 << 3) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 2 << concat(3,3) AS `2 << 3 || 3`,2 << concat(3,3) AS `2 << (3 || 3)`,concat(2 << 3,3) AS `(2 << 3) || 3` +select 2 << mariadb_schema.concat(3,3) AS `2 << 3 || 3`,2 << mariadb_schema.concat(3,3) AS `2 << (3 || 3)`,mariadb_schema.concat(2 << 3,3) AS `(2 << 3) || 3` select 2 << 3 || 3, 2 << (3 || 3), (2 << 3) || 3 union select * from v1; 2 << 3 || 3 2 << (3 || 3) (2 << 3) || 3 17179869184 17179869184 163 create or replace view v1 as select 2 >> 3 || 0, 2 >> (3 || 0), (2 >> 3) || 0; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 2 >> concat(3,0) AS `2 >> 3 || 0`,2 >> concat(3,0) AS `2 >> (3 || 0)`,concat(2 >> 3,0) AS `(2 >> 3) || 0` +select 2 >> mariadb_schema.concat(3,0) AS `2 >> 3 || 0`,2 >> mariadb_schema.concat(3,0) AS `2 >> (3 || 0)`,mariadb_schema.concat(2 >> 3,0) AS `(2 >> 3) || 0` select 2 >> 3 || 0, 2 >> (3 || 0), (2 >> 3) || 0 union select * from v1; 2 >> 3 || 0 2 >> (3 || 0) (2 >> 3) || 0 0 0 00 create or replace view v1 as select 2 + 3 || 3, 2 + (3 || 3), (2 + 3) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 2 + concat(3,3) AS `2 + 3 || 3`,2 + concat(3,3) AS `2 + (3 || 3)`,concat(2 + 3,3) AS `(2 + 3) || 3` +select 2 + mariadb_schema.concat(3,3) AS `2 + 3 || 3`,2 + mariadb_schema.concat(3,3) AS `2 + (3 || 3)`,mariadb_schema.concat(2 + 3,3) AS `(2 + 3) || 3` select 2 + 3 || 3, 2 + (3 || 3), (2 + 3) || 3 union select * from v1; 2 + 3 || 3 2 + (3 || 3) (2 + 3) || 3 35 35 53 create or replace view v1 as select 2 - 2 || 0, 2 - (2 || 0), (2 - 2) || 0; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 2 - concat(2,0) AS `2 - 2 || 0`,2 - concat(2,0) AS `2 - (2 || 0)`,concat(2 - 2,0) AS `(2 - 2) || 0` +select 2 - mariadb_schema.concat(2,0) AS `2 - 2 || 0`,2 - mariadb_schema.concat(2,0) AS `2 - (2 || 0)`,mariadb_schema.concat(2 - 2,0) AS `(2 - 2) || 0` select 2 - 2 || 0, 2 - (2 || 0), (2 - 2) || 0 union select * from v1; 2 - 2 || 0 2 - (2 || 0) (2 - 2) || 0 -18 -18 00 create or replace view v1 as select 2 * 3 || 3, 2 * (3 || 3), (2 * 3) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 2 * concat(3,3) AS `2 * 3 || 3`,2 * concat(3,3) AS `2 * (3 || 3)`,concat(2 * 3,3) AS `(2 * 3) || 3` +select 2 * mariadb_schema.concat(3,3) AS `2 * 3 || 3`,2 * mariadb_schema.concat(3,3) AS `2 * (3 || 3)`,mariadb_schema.concat(2 * 3,3) AS `(2 * 3) || 3` select 2 * 3 || 3, 2 * (3 || 3), (2 * 3) || 3 union select * from v1; 2 * 3 || 3 2 * (3 || 3) (2 * 3) || 3 66 66 63 create or replace view v1 as select 2 / 3 || 3, 2 / (3 || 3), (2 / 3) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 2 / concat(3,3) AS `2 / 3 || 3`,2 / concat(3,3) AS `2 / (3 || 3)`,concat(2 / 3,3) AS `(2 / 3) || 3` +select 2 / mariadb_schema.concat(3,3) AS `2 / 3 || 3`,2 / mariadb_schema.concat(3,3) AS `2 / (3 || 3)`,mariadb_schema.concat(2 / 3,3) AS `(2 / 3) || 3` select 2 / 3 || 3, 2 / (3 || 3), (2 / 3) || 3 union select * from v1; 2 / 3 || 3 2 / (3 || 3) (2 / 3) || 3 0.06060606060606061 0.06060606060606061 0.66673 create or replace view v1 as select 2 DIV 3 || 3, 2 DIV (3 || 3), (2 DIV 3) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 2 DIV concat(3,3) AS `2 DIV 3 || 3`,2 DIV concat(3,3) AS `2 DIV (3 || 3)`,concat(2 DIV 3,3) AS `(2 DIV 3) || 3` +select 2 DIV mariadb_schema.concat(3,3) AS `2 DIV 3 || 3`,2 DIV mariadb_schema.concat(3,3) AS `2 DIV (3 || 3)`,mariadb_schema.concat(2 DIV 3,3) AS `(2 DIV 3) || 3` select 2 DIV 3 || 3, 2 DIV (3 || 3), (2 DIV 3) || 3 union select * from v1; 2 DIV 3 || 3 2 DIV (3 || 3) (2 DIV 3) || 3 0 0 03 create or replace view v1 as select 2 MOD 3 || 3, 2 MOD (3 || 3), (2 MOD 3) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 2 MOD concat(3,3) AS `2 MOD 3 || 3`,2 MOD concat(3,3) AS `2 MOD (3 || 3)`,concat(2 MOD 3,3) AS `(2 MOD 3) || 3` +select 2 MOD mariadb_schema.concat(3,3) AS `2 MOD 3 || 3`,2 MOD mariadb_schema.concat(3,3) AS `2 MOD (3 || 3)`,mariadb_schema.concat(2 MOD 3,3) AS `(2 MOD 3) || 3` select 2 MOD 3 || 3, 2 MOD (3 || 3), (2 MOD 3) || 3 union select * from v1; 2 MOD 3 || 3 2 MOD (3 || 3) (2 MOD 3) || 3 2 2 23 create or replace view v1 as select 2 % 3 || 3, 2 % (3 || 3), (2 % 3) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 2 MOD concat(3,3) AS `2 % 3 || 3`,2 MOD concat(3,3) AS `2 % (3 || 3)`,concat(2 MOD 3,3) AS `(2 % 3) || 3` +select 2 MOD mariadb_schema.concat(3,3) AS `2 % 3 || 3`,2 MOD mariadb_schema.concat(3,3) AS `2 % (3 || 3)`,mariadb_schema.concat(2 MOD 3,3) AS `(2 % 3) || 3` select 2 % 3 || 3, 2 % (3 || 3), (2 % 3) || 3 union select * from v1; 2 % 3 || 3 2 % (3 || 3) (2 % 3) || 3 2 2 23 create or replace view v1 as select 2 ^ 3 || 3, 2 ^ (3 || 3), (2 ^ 3) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 2 ^ concat(3,3) AS `2 ^ 3 || 3`,2 ^ concat(3,3) AS `2 ^ (3 || 3)`,concat(2 ^ 3,3) AS `(2 ^ 3) || 3` +select 2 ^ mariadb_schema.concat(3,3) AS `2 ^ 3 || 3`,2 ^ mariadb_schema.concat(3,3) AS `2 ^ (3 || 3)`,mariadb_schema.concat(2 ^ 3,3) AS `(2 ^ 3) || 3` select 2 ^ 3 || 3, 2 ^ (3 || 3), (2 ^ 3) || 3 union select * from v1; 2 ^ 3 || 3 2 ^ (3 || 3) (2 ^ 3) || 3 35 35 13 create or replace view v1 as select 2 BETWEEN 1 AND 3 || 3, 2 BETWEEN 1 AND (3 || 3), (2 BETWEEN 1 AND 3) || 3; Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select 2 between 1 and concat(3,3) AS `2 BETWEEN 1 AND 3 || 3`,2 between 1 and concat(3,3) AS `2 BETWEEN 1 AND (3 || 3)`,concat(2 between 1 and 3,3) AS `(2 BETWEEN 1 AND 3) || 3` +select 2 between 1 and mariadb_schema.concat(3,3) AS `2 BETWEEN 1 AND 3 || 3`,2 between 1 and mariadb_schema.concat(3,3) AS `2 BETWEEN 1 AND (3 || 3)`,mariadb_schema.concat(2 between 1 and 3,3) AS `(2 BETWEEN 1 AND 3) || 3` select 2 BETWEEN 1 AND 3 || 3, 2 BETWEEN 1 AND (3 || 3), (2 BETWEEN 1 AND 3) || 3 union select * from v1; 2 BETWEEN 1 AND 3 || 3 2 BETWEEN 1 AND (3 || 3) (2 BETWEEN 1 AND 3) || 3 1 1 13 create or replace view v1 as select charset(2 LIKE 1 ESCAPE 3 || ''), charset(2 LIKE 1 ESCAPE (3 || '')), charset((2 LIKE 1 ESCAPE 3) || ''); Select view_definition from information_schema.views where table_schema='test' and table_name='v1'; view_definition -select charset(2 like 1 escape concat(3,'')) AS `charset(2 LIKE 1 ESCAPE 3 || '')`,charset(2 like 1 escape concat(3,'')) AS `charset(2 LIKE 1 ESCAPE (3 || ''))`,charset(concat(2 like 1 escape 3,'')) AS `charset((2 LIKE 1 ESCAPE 3) || '')` +select charset(2 like 1 escape mariadb_schema.concat(3,'')) AS `charset(2 LIKE 1 ESCAPE 3 || '')`,charset(2 like 1 escape mariadb_schema.concat(3,'')) AS `charset(2 LIKE 1 ESCAPE (3 || ''))`,charset(mariadb_schema.concat(2 like 1 escape 3,'')) AS `charset((2 LIKE 1 ESCAPE 3) || '')` select charset(2 LIKE 1 ESCAPE 3 || ''), charset(2 LIKE 1 ESCAPE (3 || '')), charset((2 LIKE 1 ESCAPE 3) || '') union select * from v1; charset(2 LIKE 1 ESCAPE 3 || '') charset(2 LIKE 1 ESCAPE (3 || '')) charset((2 LIKE 1 ESCAPE 3) || '') binary binary latin1 diff --git a/mysql-test/main/selectivity.result b/mysql-test/main/selectivity.result index 0b922609916..71063a43758 100644 --- a/mysql-test/main/selectivity.result +++ b/mysql-test/main/selectivity.result @@ -403,7 +403,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 3 SUBQUERY customer ALL NULL NULL NULL NULL 150 100.00 Using where Warnings: Note 1276 Field or reference 'dbt3_s001.customer.c_custkey' of SELECT #4 was resolved in SELECT #2 -Note 1003 /* select#1 */ select substr(`dbt3_s001`.`customer`.`c_phone`,1,2) AS `cntrycode`,count(0) AS `numcust`,sum(`dbt3_s001`.`customer`.`c_acctbal`) AS `totacctbal` from `dbt3_s001`.`customer` where substr(`dbt3_s001`.`customer`.`c_phone`,1,2) in ('10','20','14','19','11','28','25') and `dbt3_s001`.`customer`.`c_acctbal` > (/* select#3 */ select avg(`dbt3_s001`.`customer`.`c_acctbal`) from `dbt3_s001`.`customer` where `dbt3_s001`.`customer`.`c_acctbal` > 0.00 and substr(`dbt3_s001`.`customer`.`c_phone`,1,2) in ('10','20','14','19','11','28','25')) and !<in_optimizer>(1,<expr_cache><`dbt3_s001`.`customer`.`c_custkey`>(exists(/* select#4 */ select 1 from `dbt3_s001`.`orders` where `dbt3_s001`.`orders`.`o_custkey` = `dbt3_s001`.`customer`.`c_custkey` limit 1))) group by substr(`dbt3_s001`.`customer`.`c_phone`,1,2) order by substr(`dbt3_s001`.`customer`.`c_phone`,1,2) +Note 1003 /* select#1 */ select mariadb_schema.substr(`dbt3_s001`.`customer`.`c_phone`,1,2) AS `cntrycode`,count(0) AS `numcust`,sum(`dbt3_s001`.`customer`.`c_acctbal`) AS `totacctbal` from `dbt3_s001`.`customer` where mariadb_schema.substr(`dbt3_s001`.`customer`.`c_phone`,1,2) in ('10','20','14','19','11','28','25') and `dbt3_s001`.`customer`.`c_acctbal` > (/* select#3 */ select avg(`dbt3_s001`.`customer`.`c_acctbal`) from `dbt3_s001`.`customer` where `dbt3_s001`.`customer`.`c_acctbal` > 0.00 and mariadb_schema.substr(`dbt3_s001`.`customer`.`c_phone`,1,2) in ('10','20','14','19','11','28','25')) and !<in_optimizer>(1,<expr_cache><`dbt3_s001`.`customer`.`c_custkey`>(exists(/* select#4 */ select 1 from `dbt3_s001`.`orders` where `dbt3_s001`.`orders`.`o_custkey` = `dbt3_s001`.`customer`.`c_custkey` limit 1))) group by mariadb_schema.substr(`dbt3_s001`.`customer`.`c_phone`,1,2) order by mariadb_schema.substr(`dbt3_s001`.`customer`.`c_phone`,1,2) select cntrycode, count(*) as numcust, sum(c_acctbal) as totacctbal from ( select substr(c_phone, 1, 2) as cntrycode, c_acctbal @@ -444,7 +444,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 3 SUBQUERY customer ALL NULL NULL NULL NULL 150 91.00 Using where Warnings: Note 1276 Field or reference 'dbt3_s001.customer.c_custkey' of SELECT #4 was resolved in SELECT #2 -Note 1003 /* select#1 */ select substr(`dbt3_s001`.`customer`.`c_phone`,1,2) AS `cntrycode`,count(0) AS `numcust`,sum(`dbt3_s001`.`customer`.`c_acctbal`) AS `totacctbal` from `dbt3_s001`.`customer` where substr(`dbt3_s001`.`customer`.`c_phone`,1,2) in ('10','20','14','19','11','28','25') and `dbt3_s001`.`customer`.`c_acctbal` > (/* select#3 */ select avg(`dbt3_s001`.`customer`.`c_acctbal`) from `dbt3_s001`.`customer` where `dbt3_s001`.`customer`.`c_acctbal` > 0.00 and substr(`dbt3_s001`.`customer`.`c_phone`,1,2) in ('10','20','14','19','11','28','25')) and !<in_optimizer>(1,<expr_cache><`dbt3_s001`.`customer`.`c_custkey`>(exists(/* select#4 */ select 1 from `dbt3_s001`.`orders` where `dbt3_s001`.`orders`.`o_custkey` = `dbt3_s001`.`customer`.`c_custkey` limit 1))) group by substr(`dbt3_s001`.`customer`.`c_phone`,1,2) order by substr(`dbt3_s001`.`customer`.`c_phone`,1,2) +Note 1003 /* select#1 */ select mariadb_schema.substr(`dbt3_s001`.`customer`.`c_phone`,1,2) AS `cntrycode`,count(0) AS `numcust`,sum(`dbt3_s001`.`customer`.`c_acctbal`) AS `totacctbal` from `dbt3_s001`.`customer` where mariadb_schema.substr(`dbt3_s001`.`customer`.`c_phone`,1,2) in ('10','20','14','19','11','28','25') and `dbt3_s001`.`customer`.`c_acctbal` > (/* select#3 */ select avg(`dbt3_s001`.`customer`.`c_acctbal`) from `dbt3_s001`.`customer` where `dbt3_s001`.`customer`.`c_acctbal` > 0.00 and mariadb_schema.substr(`dbt3_s001`.`customer`.`c_phone`,1,2) in ('10','20','14','19','11','28','25')) and !<in_optimizer>(1,<expr_cache><`dbt3_s001`.`customer`.`c_custkey`>(exists(/* select#4 */ select 1 from `dbt3_s001`.`orders` where `dbt3_s001`.`orders`.`o_custkey` = `dbt3_s001`.`customer`.`c_custkey` limit 1))) group by mariadb_schema.substr(`dbt3_s001`.`customer`.`c_phone`,1,2) order by mariadb_schema.substr(`dbt3_s001`.`customer`.`c_phone`,1,2) select cntrycode, count(*) as numcust, sum(c_acctbal) as totacctbal from ( select substr(c_phone, 1, 2) as cntrycode, c_acctbal diff --git a/mysql-test/main/subselect_mat.result b/mysql-test/main/subselect_mat.result index c30d425eeda..c701730db69 100644 --- a/mysql-test/main/subselect_mat.result +++ b/mysql-test/main/subselect_mat.result @@ -662,7 +662,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 PRIMARY t1_16 ALL NULL NULL NULL NULL 3 100.00 Using where 2 MATERIALIZED t2_16 ALL NULL NULL NULL NULL 3 100.00 Using where Warnings: -Note 1003 /* select#1 */ select left(`test`.`t1_16`.`a1`,7) AS `left(a1,7)`,left(`test`.`t1_16`.`a2`,7) AS `left(a2,7)` from `test`.`t1_16` where <expr_cache><`test`.`t1_16`.`a1`>(<in_optimizer>(`test`.`t1_16`.`a1`,`test`.`t1_16`.`a1` in ( <materialize> (/* select#2 */ select substr(`test`.`t2_16`.`b1`,1,16) from `test`.`t2_16` where `test`.`t2_16`.`b1` > '0' ), <primary_index_lookup>(`test`.`t1_16`.`a1` in <temporary table> on distinct_key where `test`.`t1_16`.`a1` = `<subquery2>`.`substring(b1,1,16)`)))) +Note 1003 /* select#1 */ select left(`test`.`t1_16`.`a1`,7) AS `left(a1,7)`,left(`test`.`t1_16`.`a2`,7) AS `left(a2,7)` from `test`.`t1_16` where <expr_cache><`test`.`t1_16`.`a1`>(<in_optimizer>(`test`.`t1_16`.`a1`,`test`.`t1_16`.`a1` in ( <materialize> (/* select#2 */ select mariadb_schema.substr(`test`.`t2_16`.`b1`,1,16) from `test`.`t2_16` where `test`.`t2_16`.`b1` > '0' ), <primary_index_lookup>(`test`.`t1_16`.`a1` in <temporary table> on distinct_key where `test`.`t1_16`.`a1` = `<subquery2>`.`substring(b1,1,16)`)))) select left(a1,7), left(a2,7) from t1_16 where a1 in (select substring(b1,1,16) from t2_16 where b1 > '0'); @@ -713,7 +713,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 3 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 5 100.00 Using where; Using join buffer (flat, BNL join) 4 MATERIALIZED t3 ALL NULL NULL NULL NULL 4 99.22 Using where Warnings: -Note 1003 /* select#1 */ select `test`.`t1`.`a1` AS `a1`,`test`.`t1`.`a2` AS `a2` from `test`.`t1` where <expr_cache><concat(`test`.`t1`.`a1`,'x')>(<in_optimizer>(concat(`test`.`t1`.`a1`,'x'),<exists>(/* select#2 */ select left(`test`.`t1_16`.`a1`,8) from `test`.`t1_16` where <expr_cache><`test`.`t1_16`.`a1`,`test`.`t1_16`.`a2`>(<in_optimizer>((`test`.`t1_16`.`a1`,`test`.`t1_16`.`a2`),<exists>(/* select#3 */ select `test`.`t2_16`.`b1`,`test`.`t2_16`.`b2` from `test`.`t2_16` join `test`.`t2` where `test`.`t2`.`b2` = substr(`test`.`t2_16`.`b2`,1,6) and <expr_cache><`test`.`t2`.`b1`>(<in_optimizer>(`test`.`t2`.`b1`,`test`.`t2`.`b1` in ( <materialize> (/* select#4 */ select `test`.`t3`.`c1` from `test`.`t3` where `test`.`t3`.`c2` > '0' ), <primary_index_lookup>(`test`.`t2`.`b1` in <temporary table> on distinct_key where `test`.`t2`.`b1` = `<subquery4>`.`c1`)))) and <cache>(`test`.`t1_16`.`a1`) = `test`.`t2_16`.`b1` and <cache>(`test`.`t1_16`.`a2`) = `test`.`t2_16`.`b2`))) and <cache>(concat(`test`.`t1`.`a1`,'x')) = left(`test`.`t1_16`.`a1`,8)))) +Note 1003 /* select#1 */ select `test`.`t1`.`a1` AS `a1`,`test`.`t1`.`a2` AS `a2` from `test`.`t1` where <expr_cache><mariadb_schema.concat(`test`.`t1`.`a1`,'x')>(<in_optimizer>(mariadb_schema.concat(`test`.`t1`.`a1`,'x'),<exists>(/* select#2 */ select left(`test`.`t1_16`.`a1`,8) from `test`.`t1_16` where <expr_cache><`test`.`t1_16`.`a1`,`test`.`t1_16`.`a2`>(<in_optimizer>((`test`.`t1_16`.`a1`,`test`.`t1_16`.`a2`),<exists>(/* select#3 */ select `test`.`t2_16`.`b1`,`test`.`t2_16`.`b2` from `test`.`t2_16` join `test`.`t2` where `test`.`t2`.`b2` = mariadb_schema.substr(`test`.`t2_16`.`b2`,1,6) and <expr_cache><`test`.`t2`.`b1`>(<in_optimizer>(`test`.`t2`.`b1`,`test`.`t2`.`b1` in ( <materialize> (/* select#4 */ select `test`.`t3`.`c1` from `test`.`t3` where `test`.`t3`.`c2` > '0' ), <primary_index_lookup>(`test`.`t2`.`b1` in <temporary table> on distinct_key where `test`.`t2`.`b1` = `<subquery4>`.`c1`)))) and <cache>(`test`.`t1_16`.`a1`) = `test`.`t2_16`.`b1` and <cache>(`test`.`t1_16`.`a2`) = `test`.`t2_16`.`b2`))) and <cache>(mariadb_schema.concat(`test`.`t1`.`a1`,'x')) = left(`test`.`t1_16`.`a1`,8)))) drop table t1_16, t2_16, t3_16; set @blob_len = 512; set @suffix_len = @blob_len - @prefix_len; @@ -775,7 +775,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 PRIMARY t1_512 ALL NULL NULL NULL NULL 3 100.00 Using where 2 MATERIALIZED t2_512 ALL NULL NULL NULL NULL 3 100.00 Using where Warnings: -Note 1003 /* select#1 */ select left(`test`.`t1_512`.`a1`,7) AS `left(a1,7)`,left(`test`.`t1_512`.`a2`,7) AS `left(a2,7)` from `test`.`t1_512` where <expr_cache><`test`.`t1_512`.`a1`>(<in_optimizer>(`test`.`t1_512`.`a1`,`test`.`t1_512`.`a1` in ( <materialize> (/* select#2 */ select substr(`test`.`t2_512`.`b1`,1,512) from `test`.`t2_512` where `test`.`t2_512`.`b1` > '0' ), <primary_index_lookup>(`test`.`t1_512`.`a1` in <temporary table> on distinct_key where `test`.`t1_512`.`a1` = `<subquery2>`.`substring(b1,1,512)`)))) +Note 1003 /* select#1 */ select left(`test`.`t1_512`.`a1`,7) AS `left(a1,7)`,left(`test`.`t1_512`.`a2`,7) AS `left(a2,7)` from `test`.`t1_512` where <expr_cache><`test`.`t1_512`.`a1`>(<in_optimizer>(`test`.`t1_512`.`a1`,`test`.`t1_512`.`a1` in ( <materialize> (/* select#2 */ select mariadb_schema.substr(`test`.`t2_512`.`b1`,1,512) from `test`.`t2_512` where `test`.`t2_512`.`b1` > '0' ), <primary_index_lookup>(`test`.`t1_512`.`a1` in <temporary table> on distinct_key where `test`.`t1_512`.`a1` = `<subquery2>`.`substring(b1,1,512)`)))) select left(a1,7), left(a2,7) from t1_512 where a1 in (select substring(b1,1,512) from t2_512 where b1 > '0'); @@ -876,7 +876,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 PRIMARY t1_1024 ALL NULL NULL NULL NULL 3 100.00 Using where 2 DEPENDENT SUBQUERY t2_1024 ALL NULL NULL NULL NULL 3 100.00 Using where Warnings: -Note 1003 /* select#1 */ select left(`test`.`t1_1024`.`a1`,7) AS `left(a1,7)`,left(`test`.`t1_1024`.`a2`,7) AS `left(a2,7)` from `test`.`t1_1024` where <expr_cache><`test`.`t1_1024`.`a1`>(<in_optimizer>(`test`.`t1_1024`.`a1`,<exists>(/* select#2 */ select substr(`test`.`t2_1024`.`b1`,1,1024) from `test`.`t2_1024` where `test`.`t2_1024`.`b1` > '0' and <cache>(`test`.`t1_1024`.`a1`) = substr(`test`.`t2_1024`.`b1`,1,1024)))) +Note 1003 /* select#1 */ select left(`test`.`t1_1024`.`a1`,7) AS `left(a1,7)`,left(`test`.`t1_1024`.`a2`,7) AS `left(a2,7)` from `test`.`t1_1024` where <expr_cache><`test`.`t1_1024`.`a1`>(<in_optimizer>(`test`.`t1_1024`.`a1`,<exists>(/* select#2 */ select mariadb_schema.substr(`test`.`t2_1024`.`b1`,1,1024) from `test`.`t2_1024` where `test`.`t2_1024`.`b1` > '0' and <cache>(`test`.`t1_1024`.`a1`) = mariadb_schema.substr(`test`.`t2_1024`.`b1`,1,1024)))) select left(a1,7), left(a2,7) from t1_1024 where a1 in (select substring(b1,1,1024) from t2_1024 where b1 > '0'); @@ -977,7 +977,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 PRIMARY t1_1025 ALL NULL NULL NULL NULL 3 100.00 Using where 2 DEPENDENT SUBQUERY t2_1025 ALL NULL NULL NULL NULL 3 100.00 Using where Warnings: -Note 1003 /* select#1 */ select left(`test`.`t1_1025`.`a1`,7) AS `left(a1,7)`,left(`test`.`t1_1025`.`a2`,7) AS `left(a2,7)` from `test`.`t1_1025` where <expr_cache><`test`.`t1_1025`.`a1`>(<in_optimizer>(`test`.`t1_1025`.`a1`,<exists>(/* select#2 */ select substr(`test`.`t2_1025`.`b1`,1,1025) from `test`.`t2_1025` where `test`.`t2_1025`.`b1` > '0' and <cache>(`test`.`t1_1025`.`a1`) = substr(`test`.`t2_1025`.`b1`,1,1025)))) +Note 1003 /* select#1 */ select left(`test`.`t1_1025`.`a1`,7) AS `left(a1,7)`,left(`test`.`t1_1025`.`a2`,7) AS `left(a2,7)` from `test`.`t1_1025` where <expr_cache><`test`.`t1_1025`.`a1`>(<in_optimizer>(`test`.`t1_1025`.`a1`,<exists>(/* select#2 */ select mariadb_schema.substr(`test`.`t2_1025`.`b1`,1,1025) from `test`.`t2_1025` where `test`.`t2_1025`.`b1` > '0' and <cache>(`test`.`t1_1025`.`a1`) = mariadb_schema.substr(`test`.`t2_1025`.`b1`,1,1025)))) select left(a1,7), left(a2,7) from t1_1025 where a1 in (select substring(b1,1,1025) from t2_1025 where b1 > '0'); diff --git a/mysql-test/main/subselect_sj_mat.result b/mysql-test/main/subselect_sj_mat.result index ae96ec0adce..cd41061785c 100644 --- a/mysql-test/main/subselect_sj_mat.result +++ b/mysql-test/main/subselect_sj_mat.result @@ -683,7 +683,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 19 func 1 100.00 Using where 2 MATERIALIZED t2_16 ALL NULL NULL NULL NULL 3 100.00 Using where Warnings: -Note 1003 select left(`test`.`t1_16`.`a1`,7) AS `left(a1,7)`,left(`test`.`t1_16`.`a2`,7) AS `left(a2,7)` from `test`.`t1_16` semi join (`test`.`t2_16`) where `test`.`t2_16`.`b1` > '0' and `test`.`t1_16`.`a1` = substr(`test`.`t2_16`.`b1`,1,16) +Note 1003 select left(`test`.`t1_16`.`a1`,7) AS `left(a1,7)`,left(`test`.`t1_16`.`a2`,7) AS `left(a2,7)` from `test`.`t1_16` semi join (`test`.`t2_16`) where `test`.`t2_16`.`b1` > '0' and `test`.`t1_16`.`a1` = mariadb_schema.substr(`test`.`t2_16`.`b1`,1,16) select left(a1,7), left(a2,7) from t1_16 where a1 in (select substring(b1,1,16) from t2_16 where b1 > '0'); @@ -735,7 +735,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 PRIMARY t3 ALL NULL NULL NULL NULL 4 99.22 Using where; Using join buffer (flat, BNL join) 1 PRIMARY t2 ALL NULL NULL NULL NULL 5 100.00 Using where; End temporary; Using join buffer (flat, BNL join) Warnings: -Note 1003 select `test`.`t1`.`a1` AS `a1`,`test`.`t1`.`a2` AS `a2` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2_16` join `test`.`t2` join `test`.`t1_16`) where `test`.`t2`.`b1` = `test`.`t3`.`c1` and `test`.`t2_16`.`b1` = `test`.`t1_16`.`a1` and `test`.`t2_16`.`b2` = `test`.`t1_16`.`a2` and `test`.`t2`.`b2` = substr(`test`.`t1_16`.`a2`,1,6) and `test`.`t3`.`c2` > '0' and concat(`test`.`t1`.`a1`,'x') = left(`test`.`t1_16`.`a1`,8) +Note 1003 select `test`.`t1`.`a1` AS `a1`,`test`.`t1`.`a2` AS `a2` from `test`.`t1` semi join (`test`.`t3` join `test`.`t2_16` join `test`.`t2` join `test`.`t1_16`) where `test`.`t2`.`b1` = `test`.`t3`.`c1` and `test`.`t2_16`.`b1` = `test`.`t1_16`.`a1` and `test`.`t2_16`.`b2` = `test`.`t1_16`.`a2` and `test`.`t2`.`b2` = mariadb_schema.substr(`test`.`t1_16`.`a2`,1,6) and `test`.`t3`.`c2` > '0' and mariadb_schema.concat(`test`.`t1`.`a1`,'x') = left(`test`.`t1_16`.`a1`,8) drop table t1_16, t2_16, t3_16; set @blob_len = 512; set @suffix_len = @blob_len - @prefix_len; @@ -798,7 +798,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 516 func 1 100.00 Using where 2 MATERIALIZED t2_512 ALL NULL NULL NULL NULL 3 100.00 Using where Warnings: -Note 1003 select left(`test`.`t1_512`.`a1`,7) AS `left(a1,7)`,left(`test`.`t1_512`.`a2`,7) AS `left(a2,7)` from `test`.`t1_512` semi join (`test`.`t2_512`) where `test`.`t2_512`.`b1` > '0' and `test`.`t1_512`.`a1` = substr(`test`.`t2_512`.`b1`,1,512) +Note 1003 select left(`test`.`t1_512`.`a1`,7) AS `left(a1,7)`,left(`test`.`t1_512`.`a2`,7) AS `left(a2,7)` from `test`.`t1_512` semi join (`test`.`t2_512`) where `test`.`t2_512`.`b1` > '0' and `test`.`t1_512`.`a1` = mariadb_schema.substr(`test`.`t2_512`.`b1`,1,512) select left(a1,7), left(a2,7) from t1_512 where a1 in (select substring(b1,1,512) from t2_512 where b1 > '0'); @@ -901,7 +901,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 PRIMARY t1_1024 ALL NULL NULL NULL NULL 3 100.00 1 PRIMARY t2_1024 ALL NULL NULL NULL NULL 3 100.00 Using where; Start temporary; End temporary; Using join buffer (flat, BNL join) Warnings: -Note 1003 select left(`test`.`t1_1024`.`a1`,7) AS `left(a1,7)`,left(`test`.`t1_1024`.`a2`,7) AS `left(a2,7)` from `test`.`t1_1024` semi join (`test`.`t2_1024`) where `test`.`t2_1024`.`b1` > '0' and `test`.`t1_1024`.`a1` = substr(`test`.`t2_1024`.`b1`,1,1024) +Note 1003 select left(`test`.`t1_1024`.`a1`,7) AS `left(a1,7)`,left(`test`.`t1_1024`.`a2`,7) AS `left(a2,7)` from `test`.`t1_1024` semi join (`test`.`t2_1024`) where `test`.`t2_1024`.`b1` > '0' and `test`.`t1_1024`.`a1` = mariadb_schema.substr(`test`.`t2_1024`.`b1`,1,1024) select left(a1,7), left(a2,7) from t1_1024 where a1 in (select substring(b1,1,1024) from t2_1024 where b1 > '0'); @@ -1004,7 +1004,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 PRIMARY t1_1025 ALL NULL NULL NULL NULL 3 100.00 1 PRIMARY t2_1025 ALL NULL NULL NULL NULL 3 100.00 Using where; Start temporary; End temporary; Using join buffer (flat, BNL join) Warnings: -Note 1003 select left(`test`.`t1_1025`.`a1`,7) AS `left(a1,7)`,left(`test`.`t1_1025`.`a2`,7) AS `left(a2,7)` from `test`.`t1_1025` semi join (`test`.`t2_1025`) where `test`.`t2_1025`.`b1` > '0' and `test`.`t1_1025`.`a1` = substr(`test`.`t2_1025`.`b1`,1,1025) +Note 1003 select left(`test`.`t1_1025`.`a1`,7) AS `left(a1,7)`,left(`test`.`t1_1025`.`a2`,7) AS `left(a2,7)` from `test`.`t1_1025` semi join (`test`.`t2_1025`) where `test`.`t2_1025`.`b1` > '0' and `test`.`t1_1025`.`a1` = mariadb_schema.substr(`test`.`t2_1025`.`b1`,1,1025) select left(a1,7), left(a2,7) from t1_1025 where a1 in (select substring(b1,1,1025) from t2_1025 where b1 > '0'); diff --git a/mysql-test/main/type_date.result b/mysql-test/main/type_date.result index d1ea71dae68..e7c130310f3 100644 --- a/mysql-test/main/type_date.result +++ b/mysql-test/main/type_date.result @@ -595,7 +595,7 @@ id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 100.00 Using where Warnings: Warning 1292 Truncated incorrect date value: '2001-01-01x' -Note 1003 select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` = DATE'2001-01-01' and <cache>(hex(DATE'2001-01-01')) <> concat('xx',rand()) +Note 1003 select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` = DATE'2001-01-01' and <cache>(hex(DATE'2001-01-01')) <> mariadb_schema.concat('xx',rand()) DROP TABLE t1; CREATE TABLE t1 (a DATE); INSERT INTO t1 VALUES ('2001-01-01'),('2001-01-02'); |