summaryrefslogtreecommitdiff
path: root/client/mysqlslap.c
diff options
context:
space:
mode:
authorunknown <brian@zim.(none)>2006-02-25 18:03:11 -0800
committerunknown <brian@zim.(none)>2006-02-25 18:03:11 -0800
commitdc9363648bcfba4677a8762a393194c00403afcf (patch)
tree1183a7d5011a8297b4a0f3095774641503dd4d89 /client/mysqlslap.c
parent8f4cec206ba6ec44f1e1e84f4b0842f585039ace (diff)
downloadmariadb-git-dc9363648bcfba4677a8762a393194c00403afcf.tar.gz
This patch handles compiles with threads, namely if you don't have pthreads it will remove support for threads in the applications (and it is fixed in such a way that tests won't break).
client/mysqlimport.c: Add in flags to support compiles with no thread support. client/mysqlslap.c: Add support to source code to compile without threads.
Diffstat (limited to 'client/mysqlslap.c')
-rw-r--r--client/mysqlslap.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/client/mysqlslap.c b/client/mysqlslap.c
index 44b2d1b5afb..c7f6e7425ce 100644
--- a/client/mysqlslap.c
+++ b/client/mysqlslap.c
@@ -76,7 +76,9 @@ TODO:
#define RAND_STRING_SIZE 126
#include "client_priv.h"
+#ifdef HAVE_LIBPTHREAD
#include <my_pthread.h>
+#endif
#include <my_sys.h>
#include <m_string.h>
#include <mysql.h>
@@ -987,6 +989,7 @@ run_scheduler(stats *sptr, statement *stmts, uint concur, ulonglong limit)
exit(0);
}
+#ifdef HAVE_LIBPTHREAD
if (opt_use_threads)
{
pthread_t mainthread; /* Thread descriptor */
@@ -1008,8 +1011,11 @@ run_scheduler(stats *sptr, statement *stmts, uint concur, ulonglong limit)
}
}
}
+#endif
#ifndef __WIN__
+#ifdef HAVE_LIBPTHREAD
else
+#endif
{
fflush(NULL);
for (x= 0; x < concur; x++)