bzr push into mysql-trunk-bugfixing branch (mats.kindahl:3428)

[Mats Kindahl]

 3428 Mats Kindahl	2010-12-15 [merge]
      Merging with mysql-trunk-bugfixing.

    added:
      mysql-test/include/ctype_heap.inc
      mysql-test/r/ctype_utf16le.result
      mysql-test/t/ctype_utf16le.test
    modified:
      cmake/character_sets.cmake
      include/m_ctype.h
      include/mysql/plugin_audit.h
      include/mysql/plugin_audit.h.pp
      mysql-test/collections/default.weekly
      mysql-test/r/ctype_utf16.result
      mysql-test/r/ctype_utf32.result
      mysql-test/r/func_str.result
      mysql-test/suite/funcs_1/r/innodb_func_view.result
      mysql-test/suite/funcs_1/r/memory_func_view.result
      mysql-test/suite/funcs_1/r/myisam_func_view.result
      mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc
      mysql-test/suite/parts/inc/partition_decimal.inc
      mysql-test/suite/parts/inc/partition_double.inc
      mysql-test/suite/parts/inc/partition_float.inc
      mysql-test/suite/parts/r/partition_decimal_innodb.result
      mysql-test/suite/parts/r/partition_decimal_myisam.result
      mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
      mysql-test/suite/sys_vars/r/character_set_client_basic.result
      mysql-test/suite/sys_vars/r/character_set_connection_basic.result
      mysql-test/suite/sys_vars/r/character_set_database_basic.result
      mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result
      mysql-test/suite/sys_vars/r/character_set_results_basic.result
      mysql-test/t/func_str.test
      mysys/charset-def.c
      sql/field.cc
      sql/item.cc
      sql/item_func.cc
      sql/log_event.cc
      sql/mysqld.cc
      sql/sp_head.cc
      sql/sql_audit.cc
      sql/sql_audit.h
      sql/sql_connect.cc
      sql/sql_cursor.cc
      sql/sql_parse.cc
      sql/sql_prepare.cc
      sql/sql_string.cc
      sql/sys_vars.cc
      strings/ctype-ucs2.c
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2010-12-14 14:38:42 +0000
+++ b/sql/mysqld.cc	2010-12-15 10:33:40 +0000
@@ -1508,6 +1508,13 @@ void clean_up(bool print_message)
   mysql_mutex_unlock(&LOCK_thread_count);
   sys_var_end();
 
+  my_free(const_cast<char*>(log_bin_basename));
+  my_free(const_cast<char*>(log_bin_index));
+#ifndef EMBEDDED_LIBRARY
+  my_free(const_cast<char*>(relay_log_basename));
+  my_free(const_cast<char*>(relay_log_index));
+#endif
+
   /*
     The following lines may never be executed as the main thread may have
     killed us


Attachment: [text/bzr-bundle] bzr/[e-mail]