diff --git a/.bzr-mysql/default.conf b/.bzr-mysql/default.conf
index e613cefc614..f044f8e62da 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-5.1-bugteam"
+tree_name = "mysql-5.1"
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c
index 64d0ea98427..8042dc2828b 100644
--- a/mysys/mf_keycache.c
+++ b/mysys/mf_keycache.c
@@ -1729,7 +1729,7 @@ restart:
       - block assigned but not yet read from file (invalid data).
   */
 
-#if THREAD
+#ifdef THREAD
   if (keycache->in_resize)
   {
     /* This is a request during a resize operation */