diff options
author | unknown <mhansson/martin@linux-st28.site> | 2007-10-01 09:11:45 +0200 |
---|---|---|
committer | unknown <mhansson/martin@linux-st28.site> | 2007-10-01 09:11:45 +0200 |
commit | 168b4988b71ecdd0040ad046008a6fdaddf54054 (patch) | |
tree | cc66ad15fe310986093f487006f38dad79e3894c /mysql-test/r/func_misc.result | |
parent | 6c5095779c698028759b4385b451ea51b954a2f5 (diff) | |
parent | 52a6c31f93e3a6865fcc2336fe2297b6e3ada84c (diff) | |
download | mariadb-git-168b4988b71ecdd0040ad046008a6fdaddf54054.tar.gz |
Merge linux-st28.site:/home/martin/mysql/src/bug30832/my50-bug30832
into linux-st28.site:/home/martin/mysql/src/bug30832/my51-bug30832
mysql-test/r/func_misc.result:
Auto merged
mysql-test/t/func_misc.test:
Auto merged
sql/item.h:
Auto merged
Diffstat (limited to 'mysql-test/r/func_misc.result')
-rw-r--r-- | mysql-test/r/func_misc.result | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result index 39bf1470afe..4bd9d0be174 100644 --- a/mysql-test/r/func_misc.result +++ b/mysql-test/r/func_misc.result @@ -190,6 +190,22 @@ ERROR 21000: Operand should contain 1 column(s) drop table table_26093; drop function func_26093_a; drop function func_26093_b; +SELECT NAME_CONST('test', NOW()); +ERROR HY000: Incorrect arguments to NAME_CONST +SELECT NAME_CONST('test', UPPER('test')); +ERROR HY000: Incorrect arguments to NAME_CONST +SELECT NAME_CONST('test', NULL); +test +NULL +SELECT NAME_CONST('test', 1); +test +1 +SELECT NAME_CONST('test', 1.0); +test +1.0 +SELECT NAME_CONST('test', 'test'); +test +test End of 5.0 tests select connection_id() > 0; connection_id() > 0 |