database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Automerge.

Browse Source
This commit is contained in:
Alexey Kopytov
2010-04-30 15:27:17 +04:00
parent 55b7b75637 96366e1196
commit 0f5afe5d7f
4 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_select.cc
View File

@@ -1107,8 +1107,7 @@ JOIN::optimize()
}
if (conds && const_table_map != found_const_table_map &&
(select_options & SELECT_DESCRIBE) &&
select_lex->master_unit() == &thd->lex->unit) // upper level SELECT
(select_options & SELECT_DESCRIBE))
{
conds=new Item_int((longlong) 0,1); // Always false
}