diff options
| author | pem@mysql.com <> | 2003-12-19 20:13:48 +0100 |
|---|---|---|
| committer | pem@mysql.com <> | 2003-12-19 20:13:48 +0100 |
| commit | 12187684ca10653a5c3b4539b1abdf55686c23d6 (patch) | |
| tree | 73743d8dde65062bfe86e66e9d220a27139cfede /sql/sql_base.cc | |
| parent | 843d5b907b60d64ec0512b8e49778a3fb37b380c (diff) | |
| parent | d37da004f6ffb32d170ce4cb9d93ba166de5b6b0 (diff) | |
| download | mariadb-git-12187684ca10653a5c3b4539b1abdf55686c23d6.tar.gz | |
Merging lex-pointer change from 4.1 to 5.0.
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 82e84f8ce49..02ecb158ebe 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2269,7 +2269,7 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds) } } cond_and->used_tables_cache= t1->map | t2->map; - thd->lex->current_select->cond_count+=cond_and->list.elements; + thd->lex->current_select->cond_count+= cond_and->list.elements; if (!table->outer_join) // Not left join { if (!(*conds=and_conds(*conds, cond_and))) |