5.5 merge

This commit is contained in:
Sergei Golubchik 2014-03-26 22:25:38 +01:00
commit 10740939eb
600 changed files with 129057 additions and 121034 deletions

View file

@ -1642,6 +1642,7 @@ void _db_end_()
cs->stack= &init_settings;
FreeState(cs, 0);
pthread_mutex_destroy(&THR_LOCK_dbug);
init_done= 0;
}