bzr push into mysql-5.4 branch (bar:2817 to 2818) WL#751

[Alexander Barkov]

 2818 Alexander Barkov	2009-07-07
      A postfix for WL#751.
      Fixing valgrind problems discovered by "valgrind" at pushbuild.

    modified:
      sql/mysql_priv.h
      sql/mysqld.cc
      sql/sql_locale.cc
 2817 Alexander Barkov	2009-07-06
      A postfix for WL#751
      Problem:
      ctype_errors.test failed on lower-case-file-system machines.
      Fix:
      Updating the test to be filsystem independent.

    modified:
      mysql-test/r/ctype_errors.result
      mysql-test/t/ctype_errors.test
=== modified file 'sql/mysql_priv.h'
--- a/sql/mysql_priv.h	2009-07-03 05:54:09 +0000
+++ b/sql/mysql_priv.h	2009-07-07 11:33:10 +0000
@@ -238,6 +238,7 @@ extern MY_LOCALE *my_default_lc_time_nam
 MY_LOCALE *my_locale_by_name(const char *name);
 MY_LOCALE *my_locale_by_number(uint number);
 
+void cleanup_errmsgs(void);
 /*************************************************************************/
 
 /**

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2009-07-03 05:54:09 +0000
+++ b/sql/mysqld.cc	2009-07-07 11:33:10 +0000
@@ -1459,6 +1459,7 @@ void clean_up(bool print_message)
     sql_print_information(ER_DEFAULT(ER_SHUTDOWN_COMPLETE),my_progname);
   thread_scheduler.end();
   finish_client_errs();
+  cleanup_errmsgs();
   DBUG_PRINT("quit", ("Error messages freed"));
   /* Tell main we are ready */
   logger.cleanup_end();

=== modified file 'sql/sql_locale.cc'
--- a/sql/sql_locale.cc	2009-07-03 05:54:09 +0000
+++ b/sql/sql_locale.cc	2009-07-07 11:33:10 +0000
@@ -60,6 +60,15 @@ MY_LOCALE_ERRMSGS global_errmsgs[]=
 };
 
 
+void cleanup_errmsgs()
+{
+  for (MY_LOCALE_ERRMSGS *msgs= global_errmsgs; msgs->language; msgs++)
+  {
+    my_free(msgs->errmsgs, MYF(MY_WME | MY_FAE | MY_ALLOW_ZERO_PTR));
+  }
+}
+
+
 /***** LOCALE BEGIN ar_AE: Arabic - United Arab Emirates *****/
 static const char *my_locale_month_names_ar_AE[13] = 
  {"يناير","فبراير","مارس","أبريل","مايو","يونيو","يوليو","أغسطس","سبتمبر","أكتوAttachment: [text/bzr-bundle] bzr/[e-mail]