Merge branch '10.0' into 10.1

This commit is contained in:
Sergei Golubchik 2016-08-25 12:40:09 +02:00
commit 6b1863b830
381 changed files with 5154 additions and 3894 deletions

View file

@ -596,6 +596,16 @@ AND 57813X540X1723 = 'Test';
drop table t1;
#
# Bug#12735545 - PARSER STACK OVERFLOW WITH NAME_CONST
# CONTAINING OR EXPRESSION
#
--error ER_WRONG_ARGUMENTS
SELECT NAME_CONST('a', -(1 OR 2)) OR 1;
--error ER_WRONG_ARGUMENTS
SELECT NAME_CONST('a', -(1 AND 2)) OR 1;
SELECT NAME_CONST('a', -(1)) OR 1;
--echo #
--echo # End of 5.5 tests
--echo #