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

select.result, func_group.result, sql_select.cc:

After merge fix


mysql-test/r/select.result:
  After merge fix
mysql-test/r/func_group.result:
  After merge fix
sql/sql_select.cc:
  After merge fix
This commit is contained in:
unknown
2006-07-31 23:05:54 +04:00
parent 08be4e96a9
commit 45871dbfd9
3 changed files with 51 additions and 188 deletions

View File

@ -687,8 +687,9 @@ JOIN::optimize()
Notice that make_cond_for_table() will always succeed to remove all
computed conditions, because opt_sum_query() is applicable only to
conjunctions.
Preserve conditions for EXPLAIN.
*/
if (conds)
if (conds && !(thd->lex->describe & DESCRIBE_EXTENDED))
{
COND *table_independent_conds=
make_cond_for_table(conds, PSEUDO_TABLE_BITS, 0);