From 68f8339158d8b54111bf179fb08040b51b0778c0 Mon Sep 17 00:00:00 2001
From: unknown <bell@sanja.is.com.ua>
Date: Mon, 11 Aug 2003 20:48:51 +0300
Subject: fixed collation of Item_cache family (BUG#951)

mysql-test/r/subselect.result:
  test of collation
mysql-test/t/subselect.test:
  test of collation
sql/item.cc:
  coping collation in the cache
sql/item.h:
  coping collation in the cache
---
 sql/item.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sql/item.h')

diff --git a/sql/item.h b/sql/item.h
index 3412b43da44..9355b43f538 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -852,6 +852,7 @@ public:
   {
     value= item->val_int_result();
     null_value= item->null_value;
+    collation.set(item->collation);
   }
   double val() { return (double) value; }
   longlong val_int() { return value; }
@@ -869,6 +870,7 @@ public:
   {
     value= item->val_result();
     null_value= item->null_value;
+    collation.set(item->collation);
   }
   double val() { return value; }
   longlong val_int() { return (longlong) (value+(value > 0 ? 0.5 : -0.5)); }
-- 
cgit v1.2.1