Fixes for 5.1-arch repository to compile on Windows.

CMakeLists.txt:
  Moved zlib to be processed before extra as CMake doesn't handle
  forward references well.
client/CMakeLists.txt:
  Ensure that -DTHREADS is specified for mysqlslap.c
client/mysqlslap.c:
  Removed includes which are already included in client_priv.h
  Moved variable declarations to be at start of function before any
  code is emitted as VSC is strict.

1 files changed, 2 insertions, 6 deletions

diff --git a/client/mysqlslap.c b/client/mysqlslap.c
index 6fb810b6a23..809c1a6b5da 100644
--- a/client/mysqlslap.c
+++ b/client/mysqlslap.c
@@ -82,10 +82,6 @@ TODO:
 #define SELECT_TYPE_REQUIRES_PREFIX 5
 
 #include "client_priv.h"
-#include <my_pthread.h>
-#include <my_sys.h>
-#include <m_string.h>
-#include <mysql.h>
 #include <mysqld_error.h>
 #include <my_dir.h>
 #include <signal.h>
@@ -1554,13 +1550,13 @@ run_scheduler(stats *sptr, statement *stmts, uint concur, ulonglong limit)
   uint x;
   struct timeval start_time, end_time;
   thread_context con;
+  pthread_t mainthread;            /* Thread descriptor */
+  pthread_attr_t attr;          /* Thread attributes */
   DBUG_ENTER("run_scheduler");
 
   con.stmt= stmts;
   con.limit= limit;
 
-  pthread_t mainthread;            /* Thread descriptor */
-  pthread_attr_t attr;          /* Thread attributes */
   pthread_attr_init(&attr);
   pthread_attr_setdetachstate(&attr,
 		  PTHREAD_CREATE_DETACHED);