database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

5.3.4 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2012-02-15 18:08:08 +01:00
parent 47a54a2e08 764eeeee74
commit 25609313ff
117 changed files with 4695 additions and 2204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/opt_sum.cc
View File

@@ -627,7 +627,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());