diff options
author | unknown <mhansson/martin@linux-st28.site> | 2007-10-09 11:37:46 +0200 |
---|---|---|
committer | unknown <mhansson/martin@linux-st28.site> | 2007-10-09 11:37:46 +0200 |
commit | 46f2f2ef1136cce2bcc912c65b7e7200f306ee75 (patch) | |
tree | 03f78dbdec73264847015d23d7f3b6b81b2a1329 /mysql-test/r/func_misc.result | |
parent | 7e5f4fe24b0fcd8801cd3d8c0d0968c6e9431dc2 (diff) | |
parent | a462f34a94ffe2c055dbaf3e2a854911c36edfaa (diff) | |
download | mariadb-git-46f2f2ef1136cce2bcc912c65b7e7200f306ee75.tar.gz |
Merge linux-st28.site:/home/martin/mysql/src/bug30832-again/my50-bug30832-again
into linux-st28.site:/home/martin/mysql/src/bug30832-again/my51-bug30832-again
mysql-test/r/func_misc.result:
Auto merged
mysql-test/t/func_misc.test:
Auto merged
sql/item_func.h:
Auto merged
Diffstat (limited to 'mysql-test/r/func_misc.result')
-rw-r--r-- | mysql-test/r/func_misc.result | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result index 4bd9d0be174..aa75cde0525 100644 --- a/mysql-test/r/func_misc.result +++ b/mysql-test/r/func_misc.result @@ -200,9 +200,15 @@ NULL SELECT NAME_CONST('test', 1); test 1 +SELECT NAME_CONST('test', -1); +test +-1 SELECT NAME_CONST('test', 1.0); test 1.0 +SELECT NAME_CONST('test', -1.0); +test +-1.0 SELECT NAME_CONST('test', 'test'); test test |