Updated benchmarks

Portability fixes.
Fixed bug in mysqlbinlog when detecting binary log version


client/mysqlbinlog.cc:
  Fixed bug when detecting binary log version
configure.in:
  Portability fix for HPUX
mysql-test/mysql-test-run.sh:
  Portability fix
sql-bench/bench-init.pl.sh:
  Updated benchmarks
sql-bench/run-all-tests.sh:
  Updated benchmarks
sql-bench/server-cfg.sh:
  Updated benchmarks
sql-bench/test-ATIS.sh:
  Updated benchmarks
sql-bench/test-connect.sh:
  Updated benchmarks

1 files changed, 11 insertions, 5 deletions

diff --git a/sql-bench/run-all-tests.sh b/sql-bench/run-all-tests.sh
index eb07d85be03..f392431140c 100644
--- a/sql-bench/run-all-tests.sh
+++ b/sql-bench/run-all-tests.sh
@@ -109,7 +109,9 @@ print "Running tests on:    $machine\n";
 print "Arguments:           $log_prog_args\n";
 print "Comments:            $opt_comments\n";
 print "Limits from:         $opt_cmp\n";
-print "Server version:      $server_version\n\n";
+print "Server version:      $server_version\n";
+print "Optimization:        $opt_optimization\n";
+print "Hardware:            $opt_hw\n\n";
 
 
 $estimated=$warning=$got_warning=0;
@@ -285,10 +287,6 @@ sub read_headers
     {
       $log_prog_args=$1;
     }
-    elsif (/^Comments.*:\s+(.*)$/)
-    {
-      $opt_comments=$1;
-    }
     elsif (/^Limits.*:\s+(.*)$/)
     {
       $opt_cmp=$1;
@@ -297,6 +295,14 @@ sub read_headers
     {
       $server_version=$1;
     }
+    elsif (/^Optimiz.*:\s+(.*)$/)
+    {
+      $opt_optimization=$1;
+    }
+    elsif (/^Hardwar.*:\s+(.*)$/)
+    {
+      $opt_hw=$1;
+    }
   }
   close(TMP);
 }