database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt

Browse Source 
into  dl145s.mysql.com:/data0/mhansson/bug30832/my51-bug30832
This commit is contained in:
mhansson@dl145s.mysql.com
2007-10-01 19:05:23 +02:00
parent 0ba77db972 967c782fa7
commit 96e68cfbb5
3 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mysql-test/r/func_misc.result
View File

@ -190,6 +190,22 @@ ERROR 21000: Operand should contain 1 column(s)
drop table table_26093; drop table table_26093;
drop function func_26093_a; drop function func_26093_a;
drop function func_26093_b; 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 End of 5.0 tests
select connection_id() > 0; select connection_id() > 0;
connection_id() > 0 connection_id() > 0

13
mysql-test/t/func_misc.test
View File

@ -198,6 +198,19 @@ drop table table_26093;
drop function func_26093_a; drop function func_26093_a;
drop function func_26093_b; drop function func_26093_b;
#
# Bug #30832: Assertion + crash with select name_const('test',now());
#
--error ER_WRONG_ARGUMENTS
SELECT NAME_CONST('test', NOW());
--error ER_WRONG_ARGUMENTS
SELECT NAME_CONST('test', UPPER('test'));
SELECT NAME_CONST('test', NULL);
SELECT NAME_CONST('test', 1);
SELECT NAME_CONST('test', 1.0);
SELECT NAME_CONST('test', 'test');
--echo End of 5.0 tests --echo End of 5.0 tests
# #

2
sql/item.h
View File

@ -1243,6 +1243,8 @@ public:
Item_name_const(Item *name_arg, Item *val): Item_name_const(Item *name_arg, Item *val):
value_item(val), name_item(name_arg) value_item(val), name_item(name_arg)
{ {
if(!value_item->basic_const_item())
my_error(ER_WRONG_ARGUMENTS, MYF(0), "NAME_CONST");
Item::maybe_null= TRUE; Item::maybe_null= TRUE;
} }