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

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

Browse Source 
into  linux-st28.site:/home/martin/mysql/src/bug30832-again-push/my51-bug30832-again
This commit is contained in:
mhansson/martin@linux-st28.site
2007-10-09 12:06:44 +02:00
parent 731cba7b23 600d2ba0b1
commit a06a6579e8
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,9 +200,15 @@ NULL
SELECT NAME_CONST('test', 1); SELECT NAME_CONST('test', 1);
test test
1 1
SELECT NAME_CONST('test', -1);
test
-1
SELECT NAME_CONST('test', 1.0); SELECT NAME_CONST('test', 1.0);
test test
1.0 1.0
SELECT NAME_CONST('test', -1.0);
test
-1.0
SELECT NAME_CONST('test', 'test'); SELECT NAME_CONST('test', 'test');
test test
test test

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

@ -208,7 +208,9 @@ SELECT NAME_CONST('test', UPPER('test'));
SELECT NAME_CONST('test', NULL); SELECT NAME_CONST('test', NULL);
SELECT NAME_CONST('test', 1); SELECT NAME_CONST('test', 1);
SELECT NAME_CONST('test', -1);
SELECT NAME_CONST('test', 1.0); SELECT NAME_CONST('test', 1.0);
SELECT NAME_CONST('test', -1.0);
SELECT NAME_CONST('test', 'test'); SELECT NAME_CONST('test', 'test');
--echo End of 5.0 tests --echo End of 5.0 tests

1
sql/item_func.h
View File

@ -436,6 +436,7 @@ public:
longlong int_op(); longlong int_op();
my_decimal *decimal_op(my_decimal *); my_decimal *decimal_op(my_decimal *);
const char *func_name() const { return "-"; } const char *func_name() const { return "-"; }
virtual bool basic_const_item() const { return args[0]->basic_const_item(); }
void fix_length_and_dec(); void fix_length_and_dec();
void fix_num_length_and_dec(); void fix_num_length_and_dec();
uint decimal_precision() const { return args[0]->decimal_precision(); } uint decimal_precision() const { return args[0]->decimal_precision(); }