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

@ -570,6 +570,13 @@ AND 57813X540X1723 = 'Test';
N AVG
0 NULL
drop table t1;
SELECT NAME_CONST('a', -(1 OR 2)) OR 1;
ERROR HY000: Incorrect arguments to NAME_CONST
SELECT NAME_CONST('a', -(1 AND 2)) OR 1;
ERROR HY000: Incorrect arguments to NAME_CONST
SELECT NAME_CONST('a', -(1)) OR 1;
NAME_CONST('a', -(1)) OR 1
1
#
# End of 5.5 tests
#