Merge 4.1 -> 5.0.

1 files changed, 14 insertions, 3 deletions

diff --git a/sql/item_create.cc b/sql/item_create.cc
index 6519e242465..e314bfc3e2c 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -30,14 +30,14 @@ Item *create_func_acos(Item* a)
 
 Item *create_func_aes_encrypt(Item* a, Item* b)
 {
-  return new Item_func_aes_encrypt(a, b); 
+  return new Item_func_aes_encrypt(a, b);
 }
-     
+
 Item *create_func_aes_decrypt(Item* a, Item* b)
 {
   return new Item_func_aes_decrypt(a, b);
 }
-        
+
 Item *create_func_ascii(Item* a)
 {
   return new Item_func_ascii(a);
@@ -417,6 +417,16 @@ Item *create_func_ucase(Item* a)
   return new Item_func_ucase(a);
 }
 
+Item *create_func_unhex(Item* a)
+{
+  return new Item_func_unhex(a);
+}
+
+Item *create_func_uuid(void)
+{
+  return new Item_func_uuid();
+}
+
 Item *create_func_version(void)
 {
   return new Item_string(NullS,server_version, 
@@ -446,6 +456,7 @@ Item *create_func_cast(Item *a, Cast_target cast_type, int len,
 {
   Item *res;
   LINT_INIT(res);
+
   switch (cast_type) {
   case ITEM_CAST_BINARY: 	res= new Item_func_binary(a); break;
   case ITEM_CAST_SIGNED_INT:	res= new Item_func_signed(a); break;