From 27c522127f57759cf6f41148513dcd73bccb1496 Mon Sep 17 00:00:00 2001
From: unknown <bell@sanja.is.com.ua>
Date: Mon, 11 Aug 2003 13:17:48 +0300
Subject: after merge fix

---
 sql/item.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/item.cc')

diff --git a/sql/item.cc b/sql/item.cc
index 58c47025a6f..555112c1890 100644
--- 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()
 { 
-- 
cgit v1.2.1