summaryrefslogtreecommitdiff
path: root/sql/opt_subselect.h
diff options
context:
space:
mode:
authorunknown <sanja@askmonty.org>2013-09-25 21:07:06 +0300
committerunknown <sanja@askmonty.org>2013-09-25 21:07:06 +0300
commit9d83468e78ba23f024ce3c11443913ad75cf1ea5 (patch)
tree0cef7fa6a3fd2e47fe22d105b2b8bbfe1b5a03e0 /sql/opt_subselect.h
parent2fe0836eed16ce5809c34064893681f12c77da9f (diff)
parent64d6d8334fa63a0faa6d91ded21eca8e3871c7ec (diff)
downloadmariadb-git-9d83468e78ba23f024ce3c11443913ad75cf1ea5.tar.gz
merge 5.5 -> 10.0-base
Diffstat (limited to 'sql/opt_subselect.h')
-rw-r--r--sql/opt_subselect.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_subselect.h b/sql/opt_subselect.h
index 3651c1d0020..d44f193dcf2 100644
--- a/sql/opt_subselect.h
+++ b/sql/opt_subselect.h
@@ -192,7 +192,7 @@ public:
(PREV_BITS(key_part_map, max_loose_keypart+1) & // (3)
(found_part | loose_scan_keyparts)) == // (3)
PREV_BITS(key_part_map, max_loose_keypart+1) && // (3)
- !key_uses_partial_cols(s->table, key))
+ !key_uses_partial_cols(s->table->s, key))
{
/* Ok, can use the strategy */
part1_conds_met= TRUE;