database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '5.5' into 10.0

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2017-03-03 01:37:54 +02:00
parent cc413ce9a3 5a0fff50f8
commit 1acfa942ed
154 changed files with 3475 additions and 1793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysys/my_init.c
View File

@@ -227,7 +227,7 @@ Voluntary context switches %ld, Involuntary context switches %ld\n",
/* At very last, delete mysys key, it is used everywhere including DBUG */
pthread_key_delete(THR_KEY_mysys);
my_init_done=0;
my_init_done= my_thr_key_mysys_exists= 0;
} /* my_end */
#ifndef DBUG_OFF