mysql-test/mysql-test-run.sh

    added --bench option
sql-bench/Makefile.am
    added bench-count-distinct.sh test
sql-bench/bench-init.pl.sh
    added --socket option

1 files changed, 5 insertions, 4 deletions

diff --git a/sql-bench/server-cfg.sh b/sql-bench/server-cfg.sh
index 2fe5a6b1e7d..74b296cd28a 100644
--- a/sql-bench/server-cfg.sh
+++ b/sql-bench/server-cfg.sh
@@ -33,10 +33,10 @@
 
 sub get_server
 {
-  my ($name,$host,$database,$odbc,$machine)=@_;
+  my ($name,$host,$database,$odbc,$machine,$socket)=@_;
   my ($server);
   if ($name =~ /mysql/i)
-  { $server=new db_MySQL($host, $database, $machine); }
+  { $server=new db_MySQL($host, $database, $machine, $socket); }
   elsif ($name =~ /pg/i)
   { $server= new db_Pg($host,$database); }
   elsif ($name =~ /msql/i)
@@ -106,13 +106,14 @@ package db_MySQL;
 
 sub new
 {
-  my ($type,$host,$database,$machine)= @_;
+  my ($type,$host,$database,$machine,$socket)= @_;
   my $self= {};
   my %limits;
   bless $self;
 
   $self->{'cmp_name'}		= "mysql";
-  $self->{'data_source'}	= "DBI:mysql:$database:$host";
+  $self->{'data_source'}	= "DBI:mysql:database=$database;host=$host";
+  $self->{'data_source'} .= ";mysql_socket=$socket" if($socket);
   $self->{'limits'}		= \%limits;
   $self->{'smds'}		= \%smds;
   $self->{'blob'}		= "blob";