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

compilation fixes

Browse Source 
cmake/maintainer.cmake:
  don't do -Werror just yet
config.h.cmake:
  according to MSDN PSAPI_VERSION should be 1 in a portable application
mysys/my_thr_init.c:
  first, reset THR_KEY_mysys, and then free dbug data,
  because dbug data are automacially created on the next dbug call,
  unless THR_KEY_mysys is null.
This commit is contained in:
Sergei Golubchik
2011-11-27 17:50:08 +01:00
parent effed09bd7
commit dfc1901e80
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysys/my_thr_init.c
View File

@ -355,13 +355,16 @@ void my_thread_end(void)
PSI_server->delete_current_thread();
#endif
DBUG_POP();
pthread_setspecific(THR_KEY_mysys,0);
if (tmp && tmp->init)
{
#if !defined(DBUG_OFF)
/* tmp->dbug is allocated inside DBUG library */
if (tmp->dbug)
{
DBUG_POP();
free(tmp->dbug);
tmp->dbug=0;
}
@ -384,7 +387,6 @@ void my_thread_end(void)
TRASH(tmp, sizeof(*tmp));
free(tmp);
}
pthread_setspecific(THR_KEY_mysys,0);
}
struct st_my_thread_var *_my_thread_var(void)