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

Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc.

Browse Source
This commit is contained in:
Igor Babaev
2012-02-01 15:48:02 -08:00
parent 7ed15e6e50 81690cf326
commit 7b79d8a33f
57 changed files with 1456 additions and 782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/opt_sum.cc
View File

@@ -623,7 +623,12 @@ static bool matching_cond(bool max_fl, TABLE_REF *ref, KEY *keyinfo,
if (!cond)
DBUG_RETURN(TRUE);
Field *field= field_part->field;
if (!(cond->used_tables() & field->table->map))
if (cond->used_tables() & OUTER_REF_TABLE_BIT)
{
DBUG_RETURN(FALSE);
}
if (!(cond->used_tables() & field->table->map) &&
test(cond->used_tables() & ~PSEUDO_TABLE_BITS))
{
/* Condition doesn't restrict the used table */
DBUG_RETURN(!cond->const_item());