database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merging lex-pointer change from 4.1 to 5.0.

Browse Source
This commit is contained in:
pem@mysql.com
2003-12-19 20:13:48 +01:00
parent 843d5b907b d37da004f6
commit 12187684ca
17 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_base.cc
View File

@ -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)))