Always compile rPM's with --enable-thread-safe-client

sql-bench/bench-init.pl.sh:
  Add new options.
sql/mysqld.cc:
  Fix --des-key-file
support-files/mysql.spec.sh:
  Always compile with --enable-thread-safe-client

sql-bench/bench-init.pl.sh

@@ -38,12 +38,13 @@ require "$pwd/server-cfg" || die "Can't read Configuration file: $!\n";
 
 $|=1;				# Output data immediately
 
-$opt_skip_test=$opt_skip_create=$opt_skip_delete=$opt_verbose=$opt_fast_insert=$opt_lock_tables=$opt_debug=$opt_skip_delete=$opt_fast=$opt_force=$opt_log=$opt_use_old_results=$opt_help=$opt_odbc=$opt_small_test=$opt_small_tables=$opt_samll_key_tables=$opt_stage=$opt_old_headers=$opt_die_on_errors=$opt_tcpip=0;
+$opt_skip_test=$opt_skip_create=$opt_skip_delete=$opt_verbose=$opt_fast_insert=$opt_lock_tables=$opt_debug=$opt_skip_delete=$opt_fast=$opt_force=$opt_log=$opt_use_old_results=$opt_help=$opt_odbc=$opt_small_test=$opt_small_tables=$opt_samll_key_tables=$opt_stage=$opt_old_headers=$opt_die_on_errors=$opt_tcpip=$opt_random=0;
 $opt_cmp=$opt_user=$opt_password="";
 $opt_server="mysql"; $opt_dir="output";
 $opt_host="localhost";$opt_database="test";
 $opt_machine=""; $opt_suffix="";
 $opt_create_options=undef;
+$opt_threads=5;
 
 $opt_time_limit=10*60;		# Don't wait more than 10 min for some tests
 
@@ -51,7 +52,7 @@ $log_prog_args=join(" ", skip_arguments(\@ARGV,"comments","cmp","server",
 					"user", "host", "database", "password",
 					"use-old-results","skip-test",
 					"machine", "dir", "suffix", "log"));
-GetOptions("skip-test=s","comments=s","cmp=s","server=s","user=s","host=s","database=s","password=s","loop-count=i","row-count=i","skip-create","skip-delete","verbose","fast-insert","lock-tables","debug","fast","force","field-count=i","regions=i","groups=i","time-limit=i","log","use-old-results","machine=s","dir=s","suffix=s","help","odbc","small-test","small-tables","small-key-tables","stage=i","old-headers","die-on-errors","create-options=s","hires","tcpip","silent",
+GetOptions("skip-test=s","comments=s","cmp=s","server=s","user=s","host=s","database=s","password=s","loop-count=i","row-count=i","skip-create","skip-delete","verbose","fast-insert","lock-tables","debug","fast","force","field-count=i","regions=i","groups=i","time-limit=i","log","use-old-results","machine=s","dir=s","suffix=s","help","odbc","small-test","small-tables","small-key-tables","stage=i","threads=i","random","old-headers","die-on-errors","create-options=s","hires","tcpip","silent",
 "socket=s") || usage();
 
 usage() if ($opt_help);
@@ -558,6 +559,13 @@ All benchmarks takes the following options:
   different server options without overwritten old files.
   When using --fast the suffix is automaticly set to '_fast'.
 
+--random
+  Inform test suite that we are generate random inital values for sequence of
+  test executions. It should be used for imitation of real conditions.
+
+--threads=# (Default 5)
+  Number of threads for multi-user benchmarks.
+
 --tcpip
   Inform test suite that we are using TCP/IP to connect to the server. In
   this case we can\t do many new connections in a row as we in this case may

sql/mysqld.cc

@@ -3969,11 +3969,11 @@ static void get_options(int argc,char **argv)
       charsets_dir = mysql_charsets_dir;
       break;
 #include "sslopt-case.h"
-#ifdef HAVE_OPENSSL
     case OPT_DES_KEY_FILE:
+#ifdef HAVE_OPENSSL
       des_key_file=optarg;
-      break;
 #endif
+      break;
     case OPT_TX_ISOLATION:
     {
       int type;

support-files/mysql.spec.sh

@@ -187,6 +187,7 @@ sh -c  "PATH=\"${MYSQL_BUILD_PATH:-/bin:/usr/bin}\" \
             --includedir=/usr/include \
             --mandir=/usr/man \
 	    --with-embedded-server \
+	    --enable-thread-safe-client \
 	    --with-comment=\"Official MySQL RPM\";
 	    # Add this for more debugging support
 	    # --with-debug
@@ -212,7 +213,7 @@ mkdir -p $RBR
 
 # Build the shared libraries and mysqld-max
 
-BuildMySQL "--enable-shared --enable-thread-safe-client --with-berkeley-db --with-innodb --with-mysqld-ldflags='-all-static' --with-server-suffix='-Max'"
+BuildMySQL "--enable-shared --with-berkeley-db --with-innodb --with-mysqld-ldflags='-all-static' --with-server-suffix='-Max'"
 
 # Save everything for debug
 # tar cf $RBR/all.tar .