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 moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql

Browse Source 
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql


sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
mysql-test/r/user_var.result:
  Manual merge
mysql-test/t/user_var.test:
  Manual merge
This commit is contained in:
unknown
2007-06-02 23:49:52 +04:00
parent b85d7da25d 8ab1830f9a
commit 45714d35ad
4 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -318,9 +318,17 @@ SHOW COUNT(*) ERRORS;
@@session.error_count @@session.error_count
1 1
create table t1(f1 int); create table t1(f1 int);
insert into t1 values(1),(1),(2); insert into t1 values(1),(1),(2),(3),(4),(1),(3),(1);
select @a:=f1, count(f1) from t1 group by 1 order by 1; select @a:=f1, count(f1) from t1 group by 1 desc;
@a:=f1 count(f1) @a:=f1 count(f1)
1 2 4 1
3 2
2 1 2 1
1 4
select @a:=f1, count(f1) from t1 group by 1 asc;
@a:=f1 count(f1)
1 4
2 1
3 2
4 1
drop table t1; drop table t1;

5
mysql-test/t/user_var.test
View File

@ -227,6 +227,7 @@ SHOW COUNT(*) ERRORS;
# Bug#28494: Grouping by Item_func_set_user_var produces incorrect result. # Bug#28494: Grouping by Item_func_set_user_var produces incorrect result.
# #
create table t1(f1 int); create table t1(f1 int);
insert into t1 values(1),(1),(2); insert into t1 values(1),(1),(2),(3),(4),(1),(3),(1);
select @a:=f1, count(f1) from t1 group by 1 order by 1; select @a:=f1, count(f1) from t1 group by 1 desc;
select @a:=f1, count(f1) from t1 group by 1 asc;
drop table t1; drop table t1;

34
sql/item_func.cc
View File

@ -4179,6 +4179,40 @@ my_decimal *Item_func_set_user_var::val_decimal(my_decimal *val)
} }
double Item_func_set_user_var::val_real_result()
{
DBUG_ASSERT(fixed == 1);
check(TRUE);
update(); // Store expression
return entry->val_real(&null_value);
}
longlong Item_func_set_user_var::val_int_result()
{
DBUG_ASSERT(fixed == 1);
check(TRUE);
update(); // Store expression
return entry->val_int(&null_value);
}
String *Item_func_set_user_var::val_str_result(String *str)
{
DBUG_ASSERT(fixed == 1);
check(TRUE);
update(); // Store expression
return entry->val_str(&null_value, str, decimals);
}
my_decimal *Item_func_set_user_var::val_decimal_result(my_decimal *val)
{
DBUG_ASSERT(fixed == 1);
check(TRUE);
update(); // Store expression
return entry->val_decimal(&null_value, val);
}
void Item_func_set_user_var::print(String *str) void Item_func_set_user_var::print(String *str)
{ {
str->append(STRING_WITH_LEN("(@")); str->append(STRING_WITH_LEN("(@"));

4
sql/item_func.h
View File

@ -1236,6 +1236,10 @@ 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();
longlong val_int_result();
String *val_str_result(String *str);
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);
bool send(Protocol *protocol, String *str_arg); bool send(Protocol *protocol, String *str_arg);