1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc 2010-05-14 13:10:30 +0000
+++ b/sql/sql_select.cc 2010-05-18 09:27:25 +0000
@@ -12443,10 +12443,9 @@ change_cond_ref_to_const(THD *thd, I_Lis
left_item->collation.collation == value->collation.collation))
{
Item *tmp=value->clone_item();
- tmp->collation.set(right_item->collation);
-
if (tmp)
{
+ tmp->collation.set(right_item->collation);
thd->change_item_tree(args + 1, tmp);
func->update_used_tables();
if ((functype == Item_func::EQ_FUNC || functype == Item_func::EQUAL_FUNC)
@@ -12467,10 +12466,9 @@ change_cond_ref_to_const(THD *thd, I_Lis
right_item->collation.collation == value->collation.collation))
{
Item *tmp= value->clone_item();
- tmp->collation.set(left_item->collation);
-
if (tmp)
{
+ tmp->collation.set(left_item->collation);
thd->change_item_tree(args, tmp);
value= tmp;
func->update_used_tables();
|