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

Buildbot fixes: let mysql-test/t/sp.test set @@query_cache_size only if the server has query cache.

Browse Source
This commit is contained in:
Sergey Petrunya 2011-06-03 10:49:50 +04:00
parent 3fa0c9f468
commit d9513849bc
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3051,8 +3051,7 @@ begin
set @x = @x + 1; set @x = @x + 1;
return @x; return @x;
end| end|
set @qcs1 = @@query_cache_size| # Set query cache size, if we have query cache
set global query_cache_size = 100000|
set @x = 1| set @x = 1|
insert into t1 values ("qc", 42)| insert into t1 values ("qc", 42)|
select bug9902() from t1| select bug9902() from t1|
@ -3064,6 +3063,7 @@ bug9902()
select @x| select @x|
@x @x
3 3
# Restore the old query cache size
set global query_cache_size = @qcs1| set global query_cache_size = @qcs1|
delete from t1| delete from t1|
drop function bug9902| drop function bug9902|

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

@ -3748,15 +3748,23 @@ begin
return @x; return @x;
end| end|
set @qcs1 = @@query_cache_size| --disable_query_log
set global query_cache_size = 100000| --echo # Set query cache size, if we have query cache
if (`select @@have_query_cache='YES'`) {
set @qcs1 = @@query_cache_size|
set global query_cache_size = 100000|
}
--enable_query_log
set @x = 1| set @x = 1|
insert into t1 values ("qc", 42)| insert into t1 values ("qc", 42)|
select bug9902() from t1| select bug9902() from t1|
select bug9902() from t1| select bug9902() from t1|
select @x| select @x|
set global query_cache_size = @qcs1| --echo # Restore the old query cache size
if (`select @@have_query_cache='YES'`) {
set global query_cache_size = @qcs1|
}
delete from t1| delete from t1|
drop function bug9902| drop function bug9902|