Merge with 4.0.16

22 files changed, 51 insertions, 61 deletions

diff --git a/sql-bench/as3ap.sh b/sql-bench/as3ap.sh
index ed796249ebb..f6827c004d7 100644
--- a/sql-bench/as3ap.sh
+++ b/sql-bench/as3ap.sh
@@ -21,10 +21,11 @@
 
 ##################### Standard benchmark inits ##############################
 
+use Cwd;
 use DBI;
 use Benchmark;
 
-chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
+$pwd = cwd(); $pwd = "." if ($pwd eq '');
 require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
 
 $opt_loop_count=1;
diff --git a/sql-bench/bench-count-distinct.sh b/sql-bench/bench-count-distinct.sh
index 1359a864ac1..8ebc910df59 100644
--- a/sql-bench/bench-count-distinct.sh
+++ b/sql-bench/bench-count-distinct.sh
@@ -20,6 +20,7 @@
 #
 ##################### Standard benchmark inits ##############################
 
+use Cwd;
 use DBI;
 use Getopt::Long;
 use Benchmark;
@@ -30,7 +31,7 @@ $opt_small_loop_count=10;
 $opt_regions=6;
 $opt_groups=100;
 
-chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
+$pwd = cwd(); $pwd = "." if ($pwd eq '');
 require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
 
 $columns=min($limits->{'max_columns'},500,($limits->{'query_size'}-50)/24,
diff --git a/sql-bench/bench-init.pl.sh b/sql-bench/bench-init.pl.sh
index b7d2b962e13..1ac5f29723b 100644
--- a/sql-bench/bench-init.pl.sh
+++ b/sql-bench/bench-init.pl.sh
@@ -31,8 +31,9 @@
 # $server	Object for current server
 # $limits	Hash reference to limits for benchmark
 
-$benchmark_version="2.14";
+$benchmark_version="2.15";
 use Getopt::Long;
+use POSIX;
 
 require "$pwd/server-cfg" || die "Can't read Configuration file: $!\n";
 
@@ -417,24 +418,8 @@ sub machine_part
 
 sub machine
 {
-  $name= `uname -s -r -m`;
-  if ($?)
-  {
-    $name= `uname -s -m`;
-  }
-  if ($?)
-  {
-    $name= `uname -s`;
-  }
-  if ($?)
-  {
-    $name= `uname`;
-  }
-  if ($?)
-  {
-    $name="unknown";
-  }
-  chomp($name); $name =~ s/[\n\r]//g;
+  my @name = POSIX::uname();
+  my $name= $name[0] . " " . $name[2] . " " . $name[4];
   return $name;
 }
 
diff --git a/sql-bench/copy-db.sh b/sql-bench/copy-db.sh
index f5394b09923..3d2f418280c 100644
--- a/sql-bench/copy-db.sh
+++ b/sql-bench/copy-db.sh
@@ -22,12 +22,13 @@
 $VER = "1.0";
 
 use Getopt::Long;
+use Cwd;
 use DBI;
 
 $max_row_length=500000;		# Don't create bigger SQL rows that this
 $opt_lock=1;			# lock tables
 
-chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
+$pwd = cwd(); $pwd = "." if ($pwd eq '');
 
 require "$pwd/server-cfg" || die "Can't read Configuration file: $!\n";
 
diff --git a/sql-bench/crash-me.sh b/sql-bench/crash-me.sh
index ff649acdae4..00989fc0bc8 100644
--- a/sql-bench/crash-me.sh
+++ b/sql-bench/crash-me.sh
@@ -41,9 +41,11 @@
 
 $version="1.61";
 
+use Cwd;
 use DBI;
 use Getopt::Long;
-chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
+use POSIX;
+$pwd = cwd(); $pwd = "." if ($pwd eq '');
 require "$pwd/server-cfg" || die "Can't read Configuration file: $!\n";
 
 $opt_server="mysql"; $opt_host="localhost"; $opt_database="test";
@@ -3247,24 +3249,8 @@ EOF
 
 sub machine
 {
-  $name= `uname -s -r -m`;
-  if ($?)
-  {
-    $name= `uname -s -m`;
-  }
-  if ($?)
-  {
-    $name= `uname -s`;
-  }
-  if ($?)
-  {
-    $name= `uname`;
-  }
-  if ($?)
-  {
-    $name="unknown";
-  }
-  chomp($name); $name =~ s/[\n\r]//g;
+  my @name = POSIX::uname();
+  my $name= $name[0] . " " . $name[2] . " " . $name[4];
   return $name;
 }
 
diff --git a/sql-bench/innotest1.sh b/sql-bench/innotest1.sh
index b875a431040..8675de19ae4 100644
--- a/sql-bench/innotest1.sh
+++ b/sql-bench/innotest1.sh
@@ -5,12 +5,13 @@
 #

 ############################################################################

 

+use Cwd;
 use DBI;

 use Benchmark;

 

 $opt_loop_count = 100000;

 

-chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');

+$pwd = cwd(); $pwd = "." if ($pwd eq '');
 require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";

 

 print "Innotest1: MySQL/InnoDB stress test in Perl\n";

diff --git a/sql-bench/innotest1a.sh b/sql-bench/innotest1a.sh
index d78357427bc..93f8a2a443b 100644
--- a/sql-bench/innotest1a.sh
+++ b/sql-bench/innotest1a.sh
@@ -5,12 +5,13 @@
 #

 ############################################################################

 

+use Cwd;
 use DBI;

 use Benchmark;

 

 $opt_loop_count = 200000;

 

-chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');

+$pwd = cwd(); $pwd = "." if ($pwd eq '');
 require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";

 

 print "Innotest1a: MySQL/InnoDB stress test in Perl\n";

diff --git a/sql-bench/innotest1b.sh b/sql-bench/innotest1b.sh
index d83fce00efc..48fe96ebe7d 100644
--- a/sql-bench/innotest1b.sh
+++ b/sql-bench/innotest1b.sh
@@ -5,12 +5,13 @@
 #

 ############################################################################

 

+use Cwd;
 use DBI;

 use Benchmark;

 

 $opt_loop_count = 200000;

 

-chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');

+$pwd = cwd(); $pwd = "." if ($pwd eq '');
 require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";

 

 print "Innotest1b: MySQL/InnoDB stress test in Perl\n";

diff --git a/sql-bench/innotest2.sh b/sql-bench/innotest2.sh
index 05c21098249..aea44003903 100644
--- a/sql-bench/innotest2.sh
+++ b/sql-bench/innotest2.sh
@@ -5,12 +5,13 @@
 #

 ############################################################################

 

+use Cwd;
 use DBI;

 use Benchmark;

 

 $opt_loop_count = 100000;

 

-chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');

+$pwd = cwd(); $pwd = "." if ($pwd eq '');
 require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";

 

 print "Innotest2: MySQL/InnoDB stress test in Perl for FOREIGN keys\n";

diff --git a/sql-bench/innotest2a.sh b/sql-bench/innotest2a.sh
index e0fe2001d24..3d4bb9933da 100644
--- a/sql-bench/innotest2a.sh
+++ b/sql-bench/innotest2a.sh
@@ -5,12 +5,13 @@
 #

 ############################################################################

 

+use Cwd;
 use DBI;

 use Benchmark;

 

 $opt_loop_count = 100000;

 

-chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');

+$pwd = cwd(); $pwd = "." if ($pwd eq '');
 require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";

 

 print "Innotest2a: MySQL/InnoDB stress test in Perl for FOREIGN keys\n";

diff --git a/sql-bench/innotest2b.sh b/sql-bench/innotest2b.sh
index 83f48cf5352..272b6dcffd0 100644
--- a/sql-bench/innotest2b.sh
+++ b/sql-bench/innotest2b.sh
@@ -5,12 +5,13 @@
 #

 ############################################################################

 

+use Cwd;
 use DBI;

 use Benchmark;

 

 $opt_loop_count = 100000;

 

-chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');

+$pwd = cwd(); $pwd = "." if ($pwd eq '');
 require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";

 

 print "Innotest2b: MySQL/InnoDB stress test in Perl for FOREIGN keys\n";

diff --git a/sql-bench/run-all-tests.sh b/sql-bench/run-all-tests.sh
index f392431140c..da576d73852 100644
--- a/sql-bench/run-all-tests.sh
+++ b/sql-bench/run-all-tests.sh
@@ -34,11 +34,12 @@
 # --log	     ==> puts output in output/RUN-server-machine-cmp-$opt_cmp
 
 use DBI;
+use Cwd;
 
 $opt_silent=1;			# Don't write header
 
 @ORG_ARGV=@ARGV;
-chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
+$pwd = cwd(); $pwd = "." if ($pwd eq '');
 require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
 $opt_silent=0;
 $perl=$^X;
diff --git a/sql-bench/server-cfg.sh b/sql-bench/server-cfg.sh
index 55371431152..905e7ee65be 100644
--- a/sql-bench/server-cfg.sh
+++ b/sql-bench/server-cfg.sh
@@ -2862,7 +2862,6 @@ sub new
   $limits{'working_blobs'}	= 1; # If big varchar/blobs works
   $limits{'order_by_unused'}	= 0;
   $limits{'working_all_fields'} = 1;
-  $limits{'multi_distinct'}     = 1; # allows select count(distinct a),count(distinct b).. 
 
   return $self;
 }
diff --git a/sql-bench/test-ATIS.sh b/sql-bench/test-ATIS.sh
index ac3d7360198..1f11f4319b5 100644
--- a/sql-bench/test-ATIS.sh
+++ b/sql-bench/test-ATIS.sh
@@ -24,12 +24,13 @@
 # - skip a couple of the tests in Q4 that Oracle doesn't understand
 ################### Standard benchmark inits ##############################
 
+use Cwd;
 use DBI;
 use Benchmark;
 
 $opt_loop_count=100;		# Run selects this many times
 
-chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
+$pwd = cwd(); $pwd = "." if ($pwd eq '');
 require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
 
 if ($opt_small_test)
diff --git a/sql-bench/test-alter-table.sh b/sql-bench/test-alter-table.sh
index f338792e9ef..2ca54000065 100644
--- a/sql-bench/test-alter-table.sh
+++ b/sql-bench/test-alter-table.sh
@@ -20,16 +20,17 @@
 #
 ##################### Standard benchmark inits ##############################
 
+use Cwd;
 use DBI;
 use Benchmark;
 
 $opt_start_field_count=8;	# start with this many fields
-$opt_loop_count=20;		# How many tests to do
+$opt_loop_count=100;		# How many tests to do
 $opt_row_count=1000; 		# Rows in the table
 $opt_field_count=1000;		# Add until this many fields.
 $opt_time_limit=10*60;		# Don't wait more than 10 min for some tests
 
-chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
+$pwd = cwd(); $pwd = "." if ($pwd eq '');
 require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
 
 $opt_field_count=min($opt_field_count,$limits->{'max_columns'},
diff --git a/sql-bench/test-big-tables.sh b/sql-bench/test-big-tables.sh
index 151a169d31f..fb58247eddd 100644
--- a/sql-bench/test-big-tables.sh
+++ b/sql-bench/test-big-tables.sh
@@ -21,13 +21,14 @@
 
 ##################### Standard benchmark inits ##############################
 
+use Cwd;
 use DBI;
 use Benchmark;
 
 $opt_loop_count=1000; # Change this to make test harder/easier
 $opt_field_count=1000;
 
-chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
+$pwd = cwd(); $pwd = "." if ($pwd eq '');
 require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
 
 $opt_field_count=min($opt_field_count,$limits->{'max_columns'},
diff --git a/sql-bench/test-connect.sh b/sql-bench/test-connect.sh
index 0f1aca5aaa7..b7a360cac38 100644
--- a/sql-bench/test-connect.sh
+++ b/sql-bench/test-connect.sh
@@ -24,6 +24,7 @@
 # by using option --loop_value='what_ever_you_like'.
 ##################### Standard benchmark inits ##############################
 
+use Cwd;
 use DBI;
 use Benchmark;
 
@@ -31,7 +32,7 @@ $opt_loop_count=100000;	# Change this to make test harder/easier
 $str_length=65000;	# This is the length of blob strings in PART:5
 $max_test=20;		# How many times to test if the server is busy
 
-chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
+$pwd = cwd(); $pwd = "." if ($pwd eq '');
 require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
 
 # This is the length of blob strings in PART:5
diff --git a/sql-bench/test-create.sh b/sql-bench/test-create.sh
index 1e7d3841bb5..8188b47f587 100644
--- a/sql-bench/test-create.sh
+++ b/sql-bench/test-create.sh
@@ -30,13 +30,14 @@
 
 ##################### Standard benchmark inits ##############################
 
+use Cwd;
 use DBI;
 use Benchmark;
 
 $opt_loop_count=10000; # Change this to make test harder/easier
 # This is the default value for the amount of tables used in this test.
 
-chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
+$pwd = cwd(); $pwd = "." if ($pwd eq '');
 require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
 
 $create_loop_count=$opt_loop_count;
diff --git a/sql-bench/test-insert.sh b/sql-bench/test-insert.sh
index fa8c4e98b54..f83d0fd13be 100644
--- a/sql-bench/test-insert.sh
+++ b/sql-bench/test-insert.sh
@@ -28,6 +28,7 @@
 #
 ##################### Standard benchmark inits ##############################
 
+use Cwd;
 use DBI;
 use Benchmark;
 use Data::Dumper;
@@ -38,7 +39,7 @@ $range_loop_count=$small_loop_count*50;
 $many_keys_loop_count=$opt_loop_count;
 $opt_read_key_loop_count=$opt_loop_count;
 
-chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
+$pwd = cwd(); $pwd = "." if ($pwd eq '');
 require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
 
 if ($opt_small_test)
diff --git a/sql-bench/test-select.sh b/sql-bench/test-select.sh
index a5de042cab1..63f70b0aaa1 100644
--- a/sql-bench/test-select.sh
+++ b/sql-bench/test-select.sh
@@ -20,6 +20,7 @@
 #
 ##################### Standard benchmark inits ##############################
 
+use Cwd;
 use DBI;
 use Getopt::Long;
 use Benchmark;
@@ -30,7 +31,7 @@ $opt_small_loop_count=10;
 $opt_regions=6;
 $opt_groups=100;
 
-chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
+$pwd = cwd(); $pwd = "." if ($pwd eq '');
 require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
 
 $columns=min($limits->{'max_columns'},500,($limits->{'query_size'}-50)/24,
@@ -356,7 +357,8 @@ if ($limits->{'group_distinct_functions'})
     timestr(timediff($end_time, $loop_time),"all") . "\n";
 
 #  Workaround mimer's behavior
-  if (limits->{'multi_distinct'} == 1 ) {
+  if ($limits->{'multi_distinct'})
+  {
     $loop_time=new Benchmark;
     $rows=$estimated=$count=0;
     for ($i=0 ; $i < $opt_medium_loop_count ; $i++)
@@ -370,7 +372,7 @@ if ($limits->{'group_distinct_functions'})
     print_time($estimated);
     print " for count_distinct_2 ($count:$rows): " .
       timestr(timediff($end_time, $loop_time),"all") . "\n";
-  }    
+  }
 
   $loop_time=new Benchmark;
   $rows=$estimated=$count=0;
diff --git a/sql-bench/test-transactions.sh b/sql-bench/test-transactions.sh
index 8f92633524f..50d7098bca7 100644
--- a/sql-bench/test-transactions.sh
+++ b/sql-bench/test-transactions.sh
@@ -21,6 +21,7 @@
 
 ##################### Standard benchmark inits ##############################
 
+use Cwd;
 use DBI;
 use Benchmark;
 #use warnings;
@@ -30,7 +31,7 @@ $opt_groups=27;		    # Characters are 'A' -> Z
 $opt_loop_count=10000;	    # Change this to make test harder/easier
 $opt_medium_loop_count=100; # Change this to make test harder/easier
 
-chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
+$pwd = cwd(); $pwd = "." if ($pwd eq '');
 require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
 
 # Avoid warnings for variables in bench-init.pl
diff --git a/sql-bench/test-wisconsin.sh b/sql-bench/test-wisconsin.sh
index adc3e5b5aa4..89ffb9aa629 100644
--- a/sql-bench/test-wisconsin.sh
+++ b/sql-bench/test-wisconsin.sh
@@ -17,12 +17,13 @@
 # MA 02111-1307, USA
 #
 
+use Cwd;
 use DBI;
 use Benchmark;
 
 $opt_loop_count=10;
 
-chomp($pwd = `pwd`); $pwd = "." if ($pwd eq '');
+$pwd = cwd(); $pwd = "." if ($pwd eq '');
 require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
 
 $into_table = "";