diff options
| -rw-r--r-- | .bzr-mysql/default.conf | 2 | ||||
| -rw-r--r-- | mysys/my_init.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/.bzr-mysql/default.conf b/.bzr-mysql/default.conf index 4eab3d239d0..fcb3cab2de6 100644 --- a/.bzr-mysql/default.conf +++ b/.bzr-mysql/default.conf @@ -1,4 +1,4 @@ [MYSQL] post_commit_to = "commits@lists.mysql.com" post_push_to = "commits@lists.mysql.com" -tree_name = "mysql-trunk-bugfixing" +tree_name = "mysql-trunk" diff --git a/mysys/my_init.c b/mysys/my_init.c index f27f3f7b3e8..e7ab98bcb73 100644 --- 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 |