Merge neptunus.(none):/home/msvensson/mysql/bug9535

into neptunus.(none):/home/msvensson/mysql/mysql-5.0


sql/item_strfunc.h:
  Auto merged

1 files changed, 6 insertions, 1 deletions

diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index 4c44db49489..95979408ccb 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -726,7 +726,12 @@ public:
   Item_func_uuid(): Item_str_func() {}
   void fix_length_and_dec() {
     collation.set(system_charset_info);
-    max_length= UUID_LENGTH;
+    /*
+       NOTE! uuid() should be changed to use 'ascii'
+       charset when hex(), format(), md5(), etc, and implicit
+       number-to-string conversion will use 'ascii'
+    */
+    max_length= UUID_LENGTH * system_charset_info->mbmaxlen;
   }
   const char *func_name() const{ return "uuid"; }
   String *val_str(String *);