diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2009-01-12 17:24:00 +0100 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2009-01-12 17:24:00 +0100 |
| commit | 3055db5c0e4e753866bb50d792f0ad4f18e12643 (patch) | |
| tree | bea74dc335bcbceadf972f5728386b9040824e65 /sql | |
| parent | 3b23a99b8759349a07ed065f4044c3fa4b05e328 (diff) | |
| download | mariadb-git-3055db5c0e4e753866bb50d792f0ad4f18e12643.tar.gz | |
Backport of a 5.0.74 fix into 5.0.72sp1:
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.
Original changeset:
> revision-id: sergey.glukhov@sun.com-20081121123959-58ffhp2nitg7f40h
> parent: ramil@mysql.com-20081120100836-gct60cm67b1rui29
> committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
> branch nick: mysql-5.0-bugteam
> timestamp: Fri 2008-11-21 16:39:59 +0400
Diffstat (limited to 'sql')
| -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; } |