1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

set THR_THD key and current_thd=NULL as early as possible,

Browse Source 
otherwise safemalloc and my_malloc_size_cb_func will use
current_thd before it's defined
This commit is contained in:
Sergei Golubchik 2013-02-05 10:43:26 +01:00
parent 1f85b1e069
commit c7fa9fa72b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sql/mysqld.cc
View File

@ -3496,6 +3496,14 @@ static int init_common_variables()
umask(((~my_umask) & 0666)); umask(((~my_umask) & 0666));
my_decimal_set_zero(&decimal_zero); // set decimal_zero constant; my_decimal_set_zero(&decimal_zero); // set decimal_zero constant;
if (pthread_key_create(&THR_THD,NULL) ||
pthread_key_create(&THR_MALLOC,NULL))
{
sql_print_error("Can't create thread-keys");
return 1;
}
set_current_thd(0);
set_malloc_size_cb(my_malloc_size_cb_func); set_malloc_size_cb(my_malloc_size_cb_func);
tzset(); // Set tzname tzset(); // Set tzname
@ -4038,12 +4046,6 @@ static int init_thread_environment()
PTHREAD_CREATE_DETACHED); PTHREAD_CREATE_DETACHED);
pthread_attr_setscope(&connection_attrib, PTHREAD_SCOPE_SYSTEM); pthread_attr_setscope(&connection_attrib, PTHREAD_SCOPE_SYSTEM);
if (pthread_key_create(&THR_THD,NULL) ||
pthread_key_create(&THR_MALLOC,NULL))
{
sql_print_error("Can't create thread-keys");
DBUG_RETURN(1);
}
DBUG_RETURN(0); DBUG_RETURN(0);
} }