Commit ad92ee12 authored by Alexander Nozdrin's avatar Alexander Nozdrin

Auto-merge from mysql-trunk-bugfixing.

parents d348f121 ddf6a665
[MYSQL] [MYSQL]
post_commit_to = "commits@lists.mysql.com" post_commit_to = "commits@lists.mysql.com"
post_push_to = "commits@lists.mysql.com" post_push_to = "commits@lists.mysql.com"
tree_name = "mysql-trunk-bugfixing" tree_name = "mysql-trunk"
...@@ -104,8 +104,6 @@ my_bool my_basic_init(void) ...@@ -104,8 +104,6 @@ my_bool my_basic_init(void)
mysql_stdin= & instrumented_stdin; mysql_stdin= & instrumented_stdin;
#if defined(THREAD) #if defined(THREAD)
if (my_thread_global_init())
return 1;
# if defined(SAFE_MUTEX) # if defined(SAFE_MUTEX)
safe_mutex_global_init(); /* Must be called early */ safe_mutex_global_init(); /* Must be called early */
# endif # endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment