5.3 merge

This commit is contained in:
Sergei Golubchik 2012-02-24 14:37:00 +01:00
commit 3f28115e0e
35 changed files with 351 additions and 277 deletions

View file

@ -313,7 +313,6 @@ set join_buffer_size=10;
explain select sum(t1.b) from t0,t1 where t0.a=t1.a;
flush status;
select sum(t1.b) from t0,t1 where t0.a=t1.a;
--replace_result 1 1or2 2 1or2
show status like 'handler_mrr%';
set join_cache_level= @join_cache_level_save;