database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

user_var.result:

Browse Source 
Corrected test case result for the bug#28494.
item_func.h, item_func.cc:
  Corrected function names after fix for the bug#28494.
This commit is contained in:
evgen@moonbone.local
2007-06-03 15:56:48 +04:00
parent 7dbe9d3318
commit 88147d5cfe
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/r/user_var.result
View File

@ -336,16 +336,16 @@ select @a:=f1, count(f1) from t1 group by 1 asc;
4 1 4 1
select @a:=f2, count(f2) from t1 group by 1 desc; select @a:=f2, count(f2) from t1 group by 1 desc;
@a:=f2 count(f2) @a:=f2 count(f2)
a 4
b 1
c 2
d 1 d 1
c 2
b 1
a 4
select @a:=f3, count(f3) from t1 group by 1 desc; select @a:=f3, count(f3) from t1 group by 1 desc;
@a:=f3 count(f3) @a:=f3 count(f3)
1.5 4
2.5 1
3.5 2
4.5 1 4.5 1
3.5 2
2.5 1
1.5 4
select @a:=f4, count(f4) from t1 group by 1 desc; select @a:=f4, count(f4) from t1 group by 1 desc;
@a:=f4 count(f4) @a:=f4 count(f4)
4.6 1 4.6 1

4
sql/item_func.cc
View File

@ -4208,7 +4208,7 @@ my_decimal *Item_func_set_user_var::val_decimal(my_decimal *val)
} }
double Item_func_set_user_var::val_real_result() double Item_func_set_user_var::val_result()
{ {
DBUG_ASSERT(fixed == 1); DBUG_ASSERT(fixed == 1);
check(TRUE); check(TRUE);
@ -4224,7 +4224,7 @@ longlong Item_func_set_user_var::val_int_result()
return entry->val_int(&null_value); return entry->val_int(&null_value);
} }
String *Item_func_set_user_var::val_str_result(String *str) String *Item_func_set_user_var::str_result(String *str)
{ {
DBUG_ASSERT(fixed == 1); DBUG_ASSERT(fixed == 1);
check(TRUE); check(TRUE);

4
sql/item_func.h
View File

@ -1208,9 +1208,9 @@ public:
longlong val_int(); longlong val_int();
String *val_str(String *str); String *val_str(String *str);
my_decimal *val_decimal(my_decimal *); my_decimal *val_decimal(my_decimal *);
double val_real_result(); double val_result();
longlong val_int_result(); longlong val_int_result();
String *val_str_result(String *str); String *str_result(String *str);
my_decimal *val_decimal_result(my_decimal *); my_decimal *val_decimal_result(my_decimal *);
bool update_hash(void *ptr, uint length, enum Item_result type, bool update_hash(void *ptr, uint length, enum Item_result type,
CHARSET_INFO *cs, Derivation dv, bool unsigned_arg); CHARSET_INFO *cs, Derivation dv, bool unsigned_arg);