diff options
| author | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-08-16 09:31:24 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-08-16 09:31:24 +0500 |
| commit | c83d2ef612c74229b0d19d60415d0bf29f67539e (patch) | |
| tree | 0f3dd6cdc643197c55d16511b3b8c6d738ccf4d5 /sql/sql_select.cc | |
| parent | 15c7030d3c293394ee5afb128fafb4cd6125332a (diff) | |
| parent | 9d6cfa94b03790593e083f82487feb5f0eae8433 (diff) | |
| download | mariadb-git-c83d2ef612c74229b0d19d60415d0bf29f67539e.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1.b9509
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 605ef49bb07..ecb9b5b7fe8 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -4549,6 +4549,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); @@ -4570,6 +4572,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); |