1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge stella.local:/home2/mydev/mysql-5.1-ateam

Browse Source 
into  stella.local:/home2/mydev/mysql-5.1-axmrg


sql/item_func.cc:
  Auto merged
This commit is contained in:
unknown 2007-11-17 09:21:09 +01:00
commit 1e94ef77f9
3 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -353,3 +353,14 @@ select @a:=f4, count(f4) from t1 group by 1 desc;
2.6 1
1.6 4
drop table t1;
create table t1(a int);
insert into t1 values(5),(4),(4),(3),(2),(2),(2),(1);
set @rownum := 0;
set @rank := 0;
set @prev_score := NULL;
select @rownum := @rownum + 1 as row,
@rank := IF(@prev_score!=a, @rownum, @rank) as rank,
@prev_score := a as score
from t1 order by score desc;
drop table t1;
End of 5.1 tests

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

@ -237,3 +237,24 @@ select @a:=f2, count(f2) from t1 group by 1 desc;
select @a:=f3, count(f3) from t1 group by 1 desc;
select @a:=f4, count(f4) from t1 group by 1 desc;
drop table t1;
#
# Bug #32260: User variables in query cause server crash
#
create table t1(a int);
insert into t1 values(5),(4),(4),(3),(2),(2),(2),(1);
set @rownum := 0;
set @rank := 0;
set @prev_score := NULL;
# Disable the result log as we assign a value to a user variable in one part
# of a statement and use the same variable in other part of the same statement,
# so we can get unexpected results.
--disable_result_log
select @rownum := @rownum + 1 as row,
@rank := IF(@prev_score!=a, @rownum, @rank) as rank,
@prev_score := a as score
from t1 order by score desc;
--enable_result_log
drop table t1;
--echo End of 5.1 tests

3
sql/item_func.cc
View File

@ -3843,7 +3843,8 @@ Item_func_set_user_var::fix_length_and_dec()
bool Item_func_set_user_var::register_field_in_read_map(uchar *arg)
{
TABLE *table= (TABLE *) arg;
if (result_field->table == table || !table)
if (result_field &&
(!table || result_field->table == table))
bitmap_set_bit(result_field->table->read_set, result_field->field_index);
return 0;
}