diff options
author | Sergei Golubchik <serg@mariadb.org> | 2016-08-03 20:38:25 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2016-08-03 20:38:25 +0200 |
commit | a350e53b611f436ad7ac618d6fde777dd457a3fe (patch) | |
tree | bc6ab938b6d1776d5f1d5f0894b8ba22bc2b6934 /mysql-test/r/func_misc.result | |
parent | 511313b9d640b8e4b2860980e79889f125d3cd5e (diff) | |
parent | 7d57772f47e0d69b2e2a7bcd62da59e54f8c8343 (diff) | |
download | mariadb-git-a350e53b611f436ad7ac618d6fde777dd457a3fe.tar.gz |
Merge branch 'mysql/5.5' into 5.5
without a fix for Bug#12818255 (MDEV-6581)
Diffstat (limited to 'mysql-test/r/func_misc.result')
-rw-r--r-- | mysql-test/r/func_misc.result | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result index a121bd324ee..1c106acf333 100644 --- a/mysql-test/r/func_misc.result +++ b/mysql-test/r/func_misc.result @@ -574,3 +574,10 @@ drop table t1; # # End of 5.5 tests # +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 |