diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-09-05 17:09:52 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-09-05 17:09:52 -0400 |
| commit | 2e3e6ef15c7ea5fc404f5c0721050f9594378497 (patch) | |
| tree | d3d23b99fc76264bda80155221db61db0ed36f64 /sql/sql_select.cc | |
| parent | fc70197acb2e580bb34989e1ce428eb1bfa95d34 (diff) | |
| parent | c55b9f50696e3e1768f52f78b3d62f48062319f4 (diff) | |
| download | mariadb-git-2e3e6ef15c7ea5fc404f5c0721050f9594378497.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
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/sql_select.cc:
Auto merged
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); |