sql_yacc.yy, item_strfunc.cc:

  Two separate functions charset() and collatio()
item_strfunc.h:
  Two separate functions charset() and collation()


sql/item_strfunc.cc:
  Two separate functions charset() and collatio()
sql/item_strfunc.h:
  Two separate functions charset() and collation()
sql/sql_yacc.yy:
  Two separate functions charset() and collatio()

1 files changed, 13 insertions, 0 deletions

diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index b2e54474494..63b3bb20dc3 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -616,6 +616,19 @@ public:
   };
 };
 
+class Item_func_collation :public Item_str_func
+{
+public:
+  Item_func_collation(Item *a) :Item_str_func(a) {}
+  String *val_str(String *);
+  const char *func_name() const { return "collation"; }
+  void fix_length_and_dec() 
+  {
+     max_length=40; // should be enough
+     set_charset(thd_charset());
+  };
+};
+
 
 /*******************************************************
 Spatial functions