summaryrefslogtreecommitdiff
path: root/sql/opt_table_elimination.cc
diff options
context:
space:
mode:
authorSeppo Jaakola <seppo.jaakola@codership.com>2013-07-13 13:30:03 +0300
committerSeppo Jaakola <seppo.jaakola@codership.com>2013-07-13 13:30:03 +0300
commitdb0cfba638383569b1e30765e2d36e0707bfb930 (patch)
treed56bf3ec5c5804b2bd15a5eceddb14b5520b3d2e /sql/opt_table_elimination.cc
parent0a9216835f406947fb4d492616da4cda75e5e113 (diff)
parenta057b504904c3e6ab1e3006c081b4fb23faaf1d4 (diff)
downloadmariadb-git-db0cfba638383569b1e30765e2d36e0707bfb930.tar.gz
Merged with lp:maria revision #3766
Diffstat (limited to 'sql/opt_table_elimination.cc')
-rw-r--r--sql/opt_table_elimination.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_table_elimination.cc b/sql/opt_table_elimination.cc
index 33164c1ed12..1542efa7415 100644
--- a/sql/opt_table_elimination.cc
+++ b/sql/opt_table_elimination.cc
@@ -1482,7 +1482,7 @@ void check_equality(Dep_analysis_context *ctx, Dep_module_expr **eq_mod,
collation of the operation differ from the field collation.
*/
if (field->cmp_type() == STRING_RESULT &&
- ((Field_str*)field)->charset() != cond->compare_collation())
+ field->charset() != cond->compare_collation())
return;
}
}