summaryrefslogtreecommitdiff
path: root/mysql-test/suite/vcol
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2010-11-15 04:45:49 +0300
committerSergey Petrunya <psergey@askmonty.org>2010-11-15 04:45:49 +0300
commit9ab54acbf0a357584568633be616d3df4a7e1a2a (patch)
tree974cc4a097fa28046d414e29843034fff36849fe /mysql-test/suite/vcol
parent9441a9cc284b3e7b7d5582f071429340f41a3ca6 (diff)
parent3d698ac61618f658e5a25219d3eb3b29b451db00 (diff)
downloadmariadb-git-9ab54acbf0a357584568633be616d3df4a7e1a2a.tar.gz
Merge MWL#121-125 DS-MRR improvements into MWL#128 Classic hash join tree
Diffstat (limited to 'mysql-test/suite/vcol')
-rw-r--r--mysql-test/suite/vcol/t/vcol_misc.test.moved3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite/vcol/t/vcol_misc.test.moved b/mysql-test/suite/vcol/t/vcol_misc.test.moved
index afe6f838268..5031a23aa49 100644
--- a/mysql-test/suite/vcol/t/vcol_misc.test.moved
+++ b/mysql-test/suite/vcol/t/vcol_misc.test.moved
@@ -17,7 +17,8 @@ set join_cache_level=6;
explain
select * from t1,t2 where t1.b=t2.c and d <= 100;
+--sorted_result
select * from t1,t2 where t1.b=t2.c and d <= 100;
set join_cache_level=default;
-drop table t1, t2; \ No newline at end of file
+drop table t1, t2;