diff options
| author | unknown <igor@olga.mysql.com> | 2007-05-26 13:19:36 -0700 |
|---|---|---|
| committer | unknown <igor@olga.mysql.com> | 2007-05-26 13:19:36 -0700 |
| commit | 5f99cf963ea4138fd7adb70ec4a9add55388c281 (patch) | |
| tree | 0ed3d16b49fec1db72fc4d94098c275dd0c28e01 | |
| parent | faf03194f89756cd9ca1a7963fdb04bd21c2f220 (diff) | |
| download | mariadb-git-5f99cf963ea4138fd7adb70ec4a9add55388c281.tar.gz | |
Avoided warnings on Windows.
| -rw-r--r-- | sql/sql_select.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index ecdb727bcb4..57dff4b23a5 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -5905,13 +5905,13 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond) */ /* First push down constant conditions from on expressions */ - for (JOIN_TAB *tab= join->join_tab+join->const_tables; - tab < join->join_tab+join->tables ; tab++) + for (JOIN_TAB *join_tab= join->join_tab+join->const_tables; + join_tab < join->join_tab+join->tables ; join_tab++) { - if (*tab->on_expr_ref) + if (*join_tab->on_expr_ref) { - JOIN_TAB *cond_tab= tab->first_inner; - COND *tmp= make_cond_for_table(*tab->on_expr_ref, + JOIN_TAB *cond_tab= join_tab->first_inner; + COND *tmp= make_cond_for_table(*join_tab->on_expr_ref, join->const_table_map, (table_map) 0); if (!tmp) |