1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Manual merge from mysql-next-mr.

Conflicts:
  - storage/ibmdb2i/ha_ibmdb2i.cc
This commit is contained in:
Alexander Nozdrin
2009-12-22 09:32:58 +03:00
208 changed files with 6651 additions and 2419 deletions

View File

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