Strings which appear without charset context,

like number-to-string-convertion-result, now 
takes current database character set, instead of
thread character set. This makes it easy to be
SQL99 conformant and 4.0 compatible.

Item->thd_charset() is renamed to Item->default_charset()
as old name doesn't describe its nature anymore.

1 files changed, 6 insertions, 6 deletions

diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index 63b3bb20dc3..b01787d0d20 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -333,8 +333,8 @@ public:
   String *val_str(String *);
   void fix_length_and_dec() 
   { 
-    max_length= MAX_FIELD_NAME * thd_charset()->mbmaxlen; 
-    set_charset(thd_charset());
+    max_length= MAX_FIELD_NAME * default_charset()->mbmaxlen; 
+    set_charset(default_charset());
   }
   const char *func_name() const { return "database"; }
 };
@@ -346,8 +346,8 @@ public:
   String *val_str(String *);
   void fix_length_and_dec() 
   { 
-    max_length= (USERNAME_LENGTH+HOSTNAME_LENGTH+1)*thd_charset()->mbmaxlen; 
-    set_charset(thd_charset());
+    max_length= (USERNAME_LENGTH+HOSTNAME_LENGTH+1)*default_charset()->mbmaxlen; 
+    set_charset(default_charset());
   }
   const char *func_name() const { return "user"; }
 };
@@ -612,7 +612,7 @@ public:
   void fix_length_and_dec() 
   {
      max_length=40; // should be enough
-     set_charset(thd_charset());
+     set_charset(default_charset());
   };
 };
 
@@ -625,7 +625,7 @@ public:
   void fix_length_and_dec() 
   {
      max_length=40; // should be enough
-     set_charset(thd_charset());
+     set_charset(default_charset());
   };
 };