Merge a compile fix.

7a4f4568 · Joerg Bruehe · d7cc9194 · bd39cd40 · 7a4f4568 · 7a4f4568
Commit 7a4f4568 authored Oct 16, 2009 by Joerg Bruehe
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

mysys/mf_keycache.c mysys/mf_keycache.c +1 -1

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-5.1-bugteam"
+tree_name = "mysql-5.1"
--- 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 */