database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

fix for the test (real fixes will be in 10.4)

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-11-30 09:59:23 +01:00
committed by Sergei Golubchik
parent 98a39b0c91
commit af2e91d9f2
9 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/main/subselect.result
View File

@ -7535,7 +7535,7 @@ FROM x
WHERE (SELECT (SELECT x WHERE x IN (SELECT x FROM x))) > WHERE (SELECT (SELECT x WHERE x IN (SELECT x FROM x))) >
(SELECT (SELECT x ORDER BY x = x OR (x = 1 AND x = 1) DESC)) (SELECT (SELECT x ORDER BY x = x OR (x = 1 AND x = 1) DESC))
ORDER BY x ASC, x DESC, x; ORDER BY x ASC, x DESC, x;
ERROR 22007: Truncated incorrect DECIMAL value: 'x' ERROR HY000: Restrictions imposed on recursive definitions are violated for table 'x'
DROP TABLE t1, x; DROP TABLE t1, x;
# #
# End of 10.4 tests # End of 10.4 tests

2
mysql-test/main/subselect.test
View File

@ -6386,7 +6386,7 @@ let $q= WITH RECURSIVE x (x) AS (
(SELECT (SELECT x ORDER BY x = x OR (x = 1 AND x = 1) DESC)) (SELECT (SELECT x ORDER BY x = x OR (x = 1 AND x = 1) DESC))
ORDER BY x ASC, x DESC, x; ORDER BY x ASC, x DESC, x;
--error ER_TRUNCATED_WRONG_VALUE --error ER_NOT_STANDARD_COMPLIANT_RECURSIVE
eval $q; eval $q;
DROP TABLE t1, x; DROP TABLE t1, x;

2
mysql-test/main/subselect_no_exists_to_in.result
View File

@ -7535,7 +7535,7 @@ FROM x
WHERE (SELECT (SELECT x WHERE x IN (SELECT x FROM x))) > WHERE (SELECT (SELECT x WHERE x IN (SELECT x FROM x))) >
(SELECT (SELECT x ORDER BY x = x OR (x = 1 AND x = 1) DESC)) (SELECT (SELECT x ORDER BY x = x OR (x = 1 AND x = 1) DESC))
ORDER BY x ASC, x DESC, x; ORDER BY x ASC, x DESC, x;
ERROR 22007: Truncated incorrect DECIMAL value: 'x' ERROR HY000: Restrictions imposed on recursive definitions are violated for table 'x'
DROP TABLE t1, x; DROP TABLE t1, x;
# #
# End of 10.4 tests # End of 10.4 tests

2
mysql-test/main/subselect_no_mat.result
View File

@ -7528,7 +7528,7 @@ FROM x
WHERE (SELECT (SELECT x WHERE x IN (SELECT x FROM x))) > WHERE (SELECT (SELECT x WHERE x IN (SELECT x FROM x))) >
(SELECT (SELECT x ORDER BY x = x OR (x = 1 AND x = 1) DESC)) (SELECT (SELECT x ORDER BY x = x OR (x = 1 AND x = 1) DESC))
ORDER BY x ASC, x DESC, x; ORDER BY x ASC, x DESC, x;
ERROR 22007: Truncated incorrect DECIMAL value: 'x' ERROR HY000: Restrictions imposed on recursive definitions are violated for table 'x'
DROP TABLE t1, x; DROP TABLE t1, x;
# #
# End of 10.4 tests # End of 10.4 tests

2
mysql-test/main/subselect_no_opts.result
View File

@ -7526,7 +7526,7 @@ FROM x
WHERE (SELECT (SELECT x WHERE x IN (SELECT x FROM x))) > WHERE (SELECT (SELECT x WHERE x IN (SELECT x FROM x))) >
(SELECT (SELECT x ORDER BY x = x OR (x = 1 AND x = 1) DESC)) (SELECT (SELECT x ORDER BY x = x OR (x = 1 AND x = 1) DESC))
ORDER BY x ASC, x DESC, x; ORDER BY x ASC, x DESC, x;
ERROR 22007: Truncated incorrect DECIMAL value: 'x' ERROR HY000: Restrictions imposed on recursive definitions are violated for table 'x'
DROP TABLE t1, x; DROP TABLE t1, x;
# #
# End of 10.4 tests # End of 10.4 tests

2
mysql-test/main/subselect_no_scache.result
View File

@ -7541,7 +7541,7 @@ FROM x
WHERE (SELECT (SELECT x WHERE x IN (SELECT x FROM x))) > WHERE (SELECT (SELECT x WHERE x IN (SELECT x FROM x))) >
(SELECT (SELECT x ORDER BY x = x OR (x = 1 AND x = 1) DESC)) (SELECT (SELECT x ORDER BY x = x OR (x = 1 AND x = 1) DESC))
ORDER BY x ASC, x DESC, x; ORDER BY x ASC, x DESC, x;
ERROR 22007: Truncated incorrect DECIMAL value: 'x' ERROR HY000: Restrictions imposed on recursive definitions are violated for table 'x'
DROP TABLE t1, x; DROP TABLE t1, x;
# #
# End of 10.4 tests # End of 10.4 tests

2
mysql-test/main/subselect_no_semijoin.result
View File

@ -7526,7 +7526,7 @@ FROM x
WHERE (SELECT (SELECT x WHERE x IN (SELECT x FROM x))) > WHERE (SELECT (SELECT x WHERE x IN (SELECT x FROM x))) >
(SELECT (SELECT x ORDER BY x = x OR (x = 1 AND x = 1) DESC)) (SELECT (SELECT x ORDER BY x = x OR (x = 1 AND x = 1) DESC))
ORDER BY x ASC, x DESC, x; ORDER BY x ASC, x DESC, x;
ERROR 22007: Truncated incorrect DECIMAL value: 'x' ERROR HY000: Restrictions imposed on recursive definitions are violated for table 'x'
DROP TABLE t1, x; DROP TABLE t1, x;
# #
# End of 10.4 tests # End of 10.4 tests

2
sql/item_func.cc
View File

@ -1824,7 +1824,7 @@ void Item_func_neg::fix_length_and_dec_int()
Use val() to get value as arg_type doesn't mean that item is Use val() to get value as arg_type doesn't mean that item is
Item_int or Item_float due to existence of Item_param. Item_int or Item_float due to existence of Item_param.
*/ */
if (args[0]->const_item()) if (args[0]->const_item() && !args[0]->is_expensive())
{ {
longlong val= args[0]->val_int(); longlong val= args[0]->val_int();
if ((ulonglong) val >= (ulonglong) LONGLONG_MIN && if ((ulonglong) val >= (ulonglong) LONGLONG_MIN &&

2
sql/sql_cte.cc
View File

@ -643,6 +643,8 @@ void With_element::check_dependencies_in_unit(st_select_lex_unit *unit,
{ {
check_dependencies_in_select(sl, &unit_ctxt_elem, in_subq, dep_map); check_dependencies_in_select(sl, &unit_ctxt_elem, in_subq, dep_map);
} }
if ((sl= unit->fake_select_lex))
check_dependencies_in_select(sl, &unit_ctxt_elem, in_subq, dep_map);
} }