after merge fix

734a953e · bell@sanja.is.com.ua · 71b39c30 · 734a953e
Commit 734a953e authored Aug 11, 2003 by bell@sanja.is.com.ua
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/item.cc sql/item.cc +1 -1

No files found.
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -1693,7 +1693,7 @@ void Item_cache_str::store(Item *item)
    value_buff.copy(*value);
    value= &value_buff;
  }
-  set_charset(&item->collation);
+  collation.set(item->collation);
 }
 double Item_cache_str::val()
 {