bzr commit into mysql-6.0-bugteam branch (staale.smedseng:3010) Bug#41580

[Staale Smedseng]

#At file:///export/home/tmp/ss156133/z/b41580-60/ based on revid:joro@stripped

 3010 Staale Smedseng	2009-02-03 [merge]
      Bug #41580 opt_threads option is not used anywhere at all
      
      Option opt_threads was deprecated in 5.1, and is removed 
      in 6.0.
modified:
  sql-bench/bench-init.pl.sh

=== modified file 'sql-bench/bench-init.pl.sh'
--- a/sql-bench/bench-init.pl.sh	2007-02-23 11:13:55 +0000
+++ b/sql-bench/bench-init.pl.sh	2009-02-03 12:58:33 +0000
@@ -47,7 +47,6 @@ $opt_machine=""; $opt_suffix="";
 $opt_create_options=undef;
 $opt_optimization="None";
 $opt_hw="";
-$opt_threads=5;
 
 if (!defined($opt_time_limit))
 {
@@ -59,7 +58,7 @@ $log_prog_args=join(" ", skip_arguments(
 					"use-old-results","skip-test",
 					"optimization","hw",
 					"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","threads=i","random","old-headers","die-on-errors","create-options=s","hires","tcpip","silent","optimization=s","hw=s","socket=s","connect-options=s","only-missing-tests") || usage();
+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","random","old-headers","die-on-errors","create-options=s","hires","tcpip","silent","optimization=s","hw=s","socket=s","connect-options=s","only-missing-tests") || usage();
 
 usage() if ($opt_help);
 $server=get_server($opt_server,$opt_host,$opt_database,$opt_odbc,
@@ -560,9 +559,6 @@ All benchmarks takes the following optio
   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