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

Buildbot fixes:

Browse Source 
- make sp.test work both with and without query_cache (attempt 2)
- fix compile warning in make_sort_key(), as directed by SergeiG
This commit is contained in:
Sergey Petrunya 2011-06-03 21:45:24 +04:00
parent 668d79e87c
commit f0f2ec3086
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/r/sp.result
View File

@ -3064,7 +3064,6 @@ select @x|
@x @x
3 3
# Restore the old query cache size # Restore the old query cache size
set global query_cache_size = @qcs1|
delete from t1| delete from t1|
drop function bug9902| drop function bug9902|
drop function if exists bug9102| drop function if exists bug9102|

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

@ -3762,9 +3762,11 @@ select bug9902() from t1|
select @x| select @x|
--echo # Restore the old query cache size --echo # Restore the old query cache size
--disable_query_log
if (`select @@have_query_cache='YES'`) { if (`select @@have_query_cache='YES'`) {
set global query_cache_size = @qcs1| set global query_cache_size = @qcs1|
} }
--enable_query_log
delete from t1| delete from t1|
drop function bug9902| drop function bug9902|

2
sql/filesort.cc
View File

@ -875,7 +875,7 @@ static void make_sortkey(register SORTPARAM *param,
case INT_RESULT: case INT_RESULT:
case TIME_RESULT: case TIME_RESULT:
{ {
longlong value; longlong UNINIT_VAR(value);
if (sort_field->result_type == INT_RESULT) if (sort_field->result_type == INT_RESULT)
value= item->val_int_result(); value= item->val_int_result();
else else