From c5b8f48cf5acecb4f50155a98bf83f4eefd53484 Mon Sep 17 00:00:00 2001
From: "bar@gw.udmsearch.izhnet.ru" <>
Date: Thu, 20 Jun 2002 23:26:04 +0500
Subject: New CHARSET()  function

---
 sql/item_strfunc.cc | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'sql/item_strfunc.cc')

diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 81d866bfe6d..a4f09f9103e 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -1911,12 +1911,25 @@ outp:
   return str;
 }
 
+String *Item_func_charset::val_str(String *str)
+{
+  String *res = args[0]->val_str(str);
+
+  if ((null_value=(args[0]->null_value || !res->charset())))
+    return 0;
+  str->copy(res->charset()->name,strlen(res->charset()->name));
+  return str;
+}
+
+
 void Item_func_conv_charset3::fix_length_and_dec()
 {
   /* BAR TODO: What to do here??? */
 }
 
 
+
+
 String *Item_func_hex::val_str(String *str)
 {
   if (args[0]->result_type() != STRING_RESULT)
-- 
cgit v1.2.1