Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.

Conflicts:

Text conflict in .bzr-mysql/default.conf
Text conflict in mysql-test/r/explain.result
Text conflict in mysql-test/r/having.result
Text conflict in mysql-test/suite/rpl/t/disabled.def
Text conflict in mysql-test/suite/rpl/t/rpl_slave_skip.test
Text conflict in storage/federated/ha_federated.cc

1 files changed, 1 insertions, 0 deletions

diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 793e41b340e..367789b949e 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -211,6 +211,7 @@ void STDCALL mysql_server_end()
   }
   else
   {
+    free_charsets();
     mysql_thread_end();
   }