diff options
| author | cmiller@zippy.cornsilk.net <> | 2006-09-05 17:09:52 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2006-09-05 17:09:52 -0400 |
| commit | 47982ebae734677dbab51793898beffca13d2f1a (patch) | |
| tree | d3d23b99fc76264bda80155221db61db0ed36f64 /sql/sql_select.cc | |
| parent | 4c1e9c582ea85e36b922a770bcf283588c11174d (diff) | |
| parent | b1f9b63a544739d894a2928022f327217b8000b5 (diff) | |
| download | mariadb-git-47982ebae734677dbab51793898beffca13d2f1a.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index e048271ed3a..39eebd25814 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -7268,6 +7268,8 @@ change_cond_ref_to_const(THD *thd, I_List<COND_CMP> *save_list, left_item->collation.collation == value->collation.collation)) { Item *tmp=value->new_item(); + tmp->collation.set(right_item->collation); + if (tmp) { thd->change_item_tree(args + 1, tmp); @@ -7290,6 +7292,8 @@ change_cond_ref_to_const(THD *thd, I_List<COND_CMP> *save_list, right_item->collation.collation == value->collation.collation)) { Item *tmp=value->new_item(); + tmp->collation.set(left_item->collation); + if (tmp) { thd->change_item_tree(args, tmp); |