diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2008-11-21 16:39:59 +0400 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2008-11-21 16:39:59 +0400 |
| commit | bd6376f1d17240956c1b1f243aaadde2611fcb56 (patch) | |
| tree | 8558287ce7e447590919b88140920edce7ba68cd /sql/item_cmpfunc.cc | |
| parent | 1cd8b9f700a3d20e0af43896b366cef6ef0e7d4c (diff) | |
| download | mariadb-git-bd6376f1d17240956c1b1f243aaadde2611fcb56.tar.gz | |
Bug#34760 Character set autodetection appears to fail
the problem is the same as reported in bug#20835,
so the fix is backport of bug#20835 patch.
mysql-test/r/subselect.result:
test result
mysql-test/t/subselect.test:
test case
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 0410c781590..4bfae376acc 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1434,7 +1434,8 @@ bool Item_in_optimizer::fix_left(THD *thd, Item **ref) } not_null_tables_cache= args[0]->not_null_tables(); with_sum_func= args[0]->with_sum_func; - const_item_cache= args[0]->const_item(); + if ((const_item_cache= args[0]->const_item())) + cache->store(args[0]); return 0; } |