Commit d9513849 authored by Sergey Petrunya's avatar Sergey Petrunya

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

parent 3fa0c9f4
......@@ -3051,8 +3051,7 @@ begin
set @x = @x + 1;
return @x;
end|
set @qcs1 = @@query_cache_size|
set global query_cache_size = 100000|
# Set query cache size, if we have query cache
set @x = 1|
insert into t1 values ("qc", 42)|
select bug9902() from t1|
......@@ -3064,6 +3063,7 @@ bug9902()
select @x|
@x
3
# Restore the old query cache size
set global query_cache_size = @qcs1|
delete from t1|
drop function bug9902|
......
......@@ -3748,15 +3748,23 @@ begin
return @x;
end|
set @qcs1 = @@query_cache_size|
set global query_cache_size = 100000|
--disable_query_log
--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|
insert into t1 values ("qc", 42)|
select bug9902() from t1|
select bug9902() from t1|
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|
drop function bug9902|
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment