merge 5.1->5.2

This commit is contained in:
Sergei Golubchik 2010-06-01 21:52:20 +02:00
commit ffc8f62b08
1860 changed files with 994699 additions and 11892 deletions

View file

@ -215,6 +215,7 @@ void STDCALL mysql_server_end()
}
else
{
free_charsets();
mysql_thread_end();
}