Auto-merge from mysql-trunk-bugfixing.

3b3de288 · Alexander Nozdrin · 517bee4d · be9c4006 · 3b3de288 · 3b3de288
Commit 3b3de288 authored Jun 10, 2010 by Alexander Nozdrin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

.bzr-mysql/default.conf .bzr-mysql/default.conf +1 -1

mysys/my_init.c mysys/my_init.c +0 -2

No files found.
--- a/.bzr-mysql/default.conf
+++ b/.bzr-mysql/default.conf
 [MYSQL]
 post_commit_to = "commits@lists.mysql.com"
 post_push_to = "commits@lists.mysql.com"
-tree_name = "mysql-trunk-bugfixing"
+tree_name = "mysql-trunk"
--- a/mysys/my_init.c
+++ b/mysys/my_init.c
@@ -104,8 +104,6 @@ my_bool my_basic_init(void)
  mysql_stdin= & instrumented_stdin;

 #if defined(THREAD)
-  if (my_thread_global_init())
-    return 1;
 #  if defined(SAFE_MUTEX)
  safe_mutex_global_init();		/* Must be called early */
 #  endif