5.3 merge

This commit is contained in:
Sergei Golubchik 2014-02-14 14:09:29 +01:00
commit fb27ce22f7
15 changed files with 85 additions and 34 deletions

View file

@ -298,6 +298,14 @@ DROP TABLE t1;
SELECT INET_NTOA(0);
SELECT '1' IN ('1', INET_NTOA(0));
#
# MDEV-5655 Server crashes on NAME_CONST containing AND/OR expressions
#
--error ER_WRONG_ARGUMENTS
SELECT NAME_CONST('a', -(1 OR 2)) OR 1;
--error ER_WRONG_ARGUMENTS
SELECT NAME_CONST('a', -(1 AND 2)) AND 1;
SELECT NAME_CONST('a', -(1)) OR 1;
--echo #
--echo # Bug #52165: Assertion failed: file .\dtoa.c, line 465
@ -372,6 +380,3 @@ drop table t1,tv;
--echo # End of 5.5 tests
--echo #
--echo #
--echo # End of tests
--echo #