diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-08-21 16:38:29 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-08-21 16:38:29 +0500 |
| commit | 4a61b16b7cd2abf6aeb2a6fb49d83e82202335d3 (patch) | |
| tree | 1c3d389fb70f80301135cb1813de0bd8d2901df2 /sql/sql_base.cc | |
| parent | 0ece5608fc93d761387a0c081a255d06646a691a (diff) | |
| parent | 56a6c1d04d911cf96ee54040f1c3b77d3dfc1a59 (diff) | |
| download | mariadb-git-4a61b16b7cd2abf6aeb2a6fb49d83e82202335d3.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.1
into gleb.loc:/home/uchum/work/bk/5.1-opt
sql/sql_base.cc:
Auto merged
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 1deceb15b16..d5e72360f9c 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -6731,6 +6731,7 @@ int setup_conds(THD *thd, TABLE_LIST *tables, TABLE_LIST *leaves, DBUG_PRINT("info", ("thd->mark_used_columns: %d", thd->mark_used_columns)); select_lex->cond_count= 0; select_lex->between_count= 0; + select_lex->max_equal_elems= 0; for (table= tables; table; table= table->next_local) { |