summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorRamil Kalimullin <ramil@mysql.com>2009-12-26 15:25:56 +0400
committerRamil Kalimullin <ramil@mysql.com>2009-12-26 15:25:56 +0400
commit041baac3262a8d42452c83216d790ef1557668c3 (patch)
treed2dfabf469c1fbfcb2d629f934862f99826daed1 /sql/sql_select.cc
parent916b559b10d06574ac77ab549785726ba2878222 (diff)
parent732a6a9e36e54e53299ac6d4d53897e9223f4805 (diff)
downloadmariadb-git-041baac3262a8d42452c83216d790ef1557668c3.tar.gz
Auto-merge.
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index d50bb888850..644f0072b7b 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -7067,6 +7067,7 @@ static void update_depend_map(JOIN *join, ORDER *order)
table_map depend_map;
order->item[0]->update_used_tables();
order->depend_map=depend_map=order->item[0]->used_tables();
+ order->used= 0;
// Not item_sum(), RAND() and no reference to table outside of sub select
if (!(order->depend_map & (OUTER_REF_TABLE_BIT | RAND_TABLE_BIT))
&& !order->item[0]->with_sum_func)