diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-01-08 15:04:14 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-01-08 15:04:14 -0800 |
| commit | 7d9df8075e4c9392f4352e6ccd86921994f264bc (patch) | |
| tree | 916e10b0a8725f6226c3f9c630516d5c918c8bac /sql/sql_select.cc | |
| parent | 01dca17a9c2255845c050c44e152ece256c9112e (diff) | |
| parent | ac45f3b38a2098a0a29fd53f023866d6c0dce78d (diff) | |
| download | mariadb-git-7d9df8075e4c9392f4352e6ccd86921994f264bc.tar.gz | |
Merge 5.5 -> mwl248
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 3550155606e..898fd47dd24 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -7335,10 +7335,10 @@ JOIN_TAB *next_breadth_first_tab(JOIN *join, enum enum_exec_or_opt tabs_kind, } -JOIN_TAB *first_top_level_tab(JOIN *join, enum enum_with_const_tables with_const) +JOIN_TAB *first_top_level_tab(JOIN *join, enum enum_with_const_tables const_tbls) { JOIN_TAB *tab= join->join_tab; - if (with_const == WITH_CONST_TABLES) + if (const_tbls == WITHOUT_CONST_TABLES) { if (join->const_tables == join->table_count) return NULL; |