diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-02-16 13:26:27 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-02-16 13:26:27 +0300 |
| commit | 716091e2a058644b81755ec3f3b1f736b0c84782 (patch) | |
| tree | e9185e4bd3fe912caa2dad3648c324300d499d0d /sql/sql_join_cache.cc | |
| parent | db7461783e3947270fca31b8f3baa6e95cb95528 (diff) | |
| download | mariadb-git-716091e2a058644b81755ec3f3b1f736b0c84782.tar.gz | |
Post-merge fixes part 4
Diffstat (limited to 'sql/sql_join_cache.cc')
| -rw-r--r-- | sql/sql_join_cache.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc index 55b84077c26..fbbcf395980 100644 --- a/sql/sql_join_cache.cc +++ b/sql/sql_join_cache.cc @@ -923,7 +923,7 @@ int JOIN_CACHE::alloc_buffer() //psergey-merge: for (tab= join->join_tab+join->const_tables; tab <= join_tab; tab++) // for (tab= cache->join_tab-cache->tables; tab < cache->join_tab ; tab++) // (fixed) - for (tab= join->join_tab + join->const_tables; tab!= join_tab; + for (tab= /*join->join_tab + join->const_tables*/ start_tab; tab!= join_tab; tab= next_linear_tab(join, tab, FALSE)) { cache= tab->cache; |