summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2002-06-14 15:15:24 +0300
committerunknown <Sinisa@sinisa.nasamreza.org>2002-06-14 15:15:24 +0300
commit52eab5dca2daa9577673079e767b4a75d2641796 (patch)
tree4285584a1a645dd80a5abf12733c274203dcdcd7 /sql
parent501839ae29e00c98982039c11392a3a3572571fe (diff)
parent4a1b497899c01fd3df7deaa94ee9171fead111f5 (diff)
downloadmariadb-git-52eab5dca2daa9577673079e767b4a75d2641796.tar.gz
Merge
Docs/manual.texi: SCCS merged
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_select.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 3a52da5a084..9bb1365e4c3 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -257,7 +257,14 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
}
TABLE_LIST *table;
for (table=tables ; table ; table=table->next)
+ {
join.tables++;
+ if (!thd->used_tables)
+ {
+ TABLE *tbl=table->table;
+ tbl->keys_in_use_for_query=tbl->used_keys= tbl->keys_in_use=0;
+ }
+ }
}
procedure=setup_procedure(thd,proc_param,result,fields,&error);
if (error)