List:Commits« Previous MessageNext Message »
From:sergeyv Date:January 20 2006 3:20pm
Subject:bk commit into 5.1 tree (SergeyV:1.2059)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of sergeyv. When sergeyv does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2059 06/01/20 18:20:03 SergeyV@selena. +1 -0
  Post review updates for win32 port of mysqlslap

  client/mysqlslap.c
    1.17 06/01/20 18:19:53 SergeyV@selena. +5 -5
    Post review updates for win32 port of mysqlslap

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	SergeyV
# Host:	selena.
# Root:	H:/MYSQL/src/#00000-mysql-5.1

--- 1.16/client/mysqlslap.c	2006-01-16 19:34:51 +03:00
+++ 1.17/client/mysqlslap.c	2006-01-20 18:19:53 +03:00
@@ -98,9 +98,6 @@
 #define srandom  srand
 #define random   rand
 #define snprintf _snprintf
-#define USE_THREADS_DEFAULT TRUE
-#else
-#define USE_THREADS_DEFAULT FALSE
 #endif
 
 #ifdef HAVE_SMEM 
@@ -248,7 +245,10 @@
   unsigned long long client_limit;
   statement *eptr;
 
-  //DBUG_ENTER("main");
+#ifdef __WIN__
+  opt_use_threads= 1;
+#endif
+
   MY_INIT(argv[0]);
 
   /* Seed the random number generator if we will be using it. */
@@ -478,7 +478,7 @@
   {"use-threads", OPT_USE_THREADS,
     "Use pthread calls instead of fork() calls (default on Windows)",
       (gptr*) &opt_use_threads, (gptr*) &opt_use_threads, 0, 
-      GET_NO_ARG, NO_ARG, USE_THREADS_DEFAULT, 0, 0, 0, 0, 0},
+      GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
 #include <sslopt-longopts.h>
 #ifndef DONT_ALLOW_USER_CHANGE
   {"user", 'u', "User for login if not current user.", (gptr*) &user,
Thread
bk commit into 5.1 tree (SergeyV:1.2059)sergeyv20 Jan