Merge work.mysql.com:/home/bk/mysql

into work.mysql.com:/d1/users/tim/src/mysql


BitKeeper/etc/logging_ok:
  auto-union
sql/ha_berkeley.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

1 files changed, 5 insertions, 4 deletions

diff --git a/client/thread_test.c b/client/thread_test.c
index def3381eb89..c76489ed946 100644
--- a/client/thread_test.c
+++ b/client/thread_test.c
@@ -16,10 +16,6 @@
    MA 02111-1307, USA */
 
 #include <global.h>
-#include <my_sys.h>
-#include <my_pthread.h>
-#include "mysql.h"
-#include <getopt.h>
 
 #ifndef THREAD
 
@@ -30,6 +26,11 @@ int main(int argc, char **argv)
 }
 #else
 
+#include <my_sys.h>
+#include <my_pthread.h>
+#include "mysql.h"
+#include <getopt.h>
+
 static my_bool version,verbose;
 static uint thread_count,number_of_tests=1000,number_of_threads=2;
 static pthread_cond_t COND_thread_count;