bzr push into mysql-trunk branch (guilhem.bichot:3744 to 3745) Bug#11822249

[Guilhem Bichot]

 3745 Guilhem Bichot	2011-03-10
      post-fix for Bug#11822249 "CHARSET_INFO POINTERS ARE NOT CONST-CLEAN":
      one virtual function was accidentally overloaded.

    modified:
      sql/item_strfunc.cc
      sql/item_strfunc.h
 3744 Anitha Gopi	2011-03-10 [merge]
      Null merge from 5.5

=== modified file 'sql/item_strfunc.cc'
--- a/sql/item_strfunc.cc	2011-03-09 20:54:55 +0000
+++ b/sql/item_strfunc.cc	2011-03-10 08:23:14 +0000
@@ -2075,7 +2075,7 @@ void Item_func_decode::crypto_transform(
 }
 
 
-Item *Item_func_sysconst::safe_charset_converter(CHARSET_INFO *tocs)
+Item *Item_func_sysconst::safe_charset_converter(const CHARSET_INFO *tocs)
 {
   Item_string *conv;
   uint conv_errors;

=== modified file 'sql/item_strfunc.h'
--- a/sql/item_strfunc.h	2011-03-09 20:54:55 +0000
+++ b/sql/item_strfunc.h	2011-03-10 08:23:14 +0000
@@ -454,7 +454,7 @@ class Item_func_sysconst :public Item_st
 public:
   Item_func_sysconst()
   { collation.set(system_charset_info,DERIVATION_SYSCONST); }
-  Item *safe_charset_converter(CHARSET_INFO *tocs);
+  Item *safe_charset_converter(const CHARSET_INFO *tocs);
   /*
     Used to create correct Item name in new converted item in
     safe_charset_converter, return string representation of this function

No bundle (reason: useless for push emails).