UCS2 support in ENUM and SET, which also fixes:

Bug #5174 SHOW CREATE TABLE hangs up if the table contains half-with katakana enum values
UCS2 values are stored in HEX encoding in FRM file

1 files changed, 17 insertions, 0 deletions

diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 3a19a903e00..cefc77cb5d4 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -1201,6 +1201,23 @@ inline void setup_table_map(TABLE *table, TABLE_LIST *table_list, uint tablenr)
 
 
 /*
+  SYNOPSYS
+    hexchar_to_int()
+    convert a hex digit into number
+*/
+
+inline int hexchar_to_int(char c)
+{
+  if (c <= '9' && c >= '0')
+    return c-'0';
+  c|=32;
+  if (c <= 'f' && c >= 'a')
+    return c-'a'+10;
+  return -1;
+}
+
+
+/*
   Some functions that are different in the embedded library and the normal
   server
 */