diff options
| author | unknown <gluh@gluh.(none)> | 2002-10-30 18:27:15 +0400 |
|---|---|---|
| committer | unknown <gluh@gluh.(none)> | 2002-10-30 18:27:15 +0400 |
| commit | f6b9a33fb67c9143bda91e2fbdef6272c6d2e209 (patch) | |
| tree | 38839ca178724a0c1e4929cffab0c86dc513d145 /sql-bench/server-cfg.sh | |
| parent | 59f65c4b0b3ddd1e75566b0021b9e25580829835 (diff) | |
| download | mariadb-git-f6b9a33fb67c9143bda91e2fbdef6272c6d2e209.tar.gz | |
Some changes for SSL
sql-bench/bench-init.pl.sh:
Add option connect-options(using with SSL)
sql-bench/server-cfg.sh:
Add option connect-option(using with SSL)
sql/sql_acl.cc:
Fix bug when GRANT ... REQUIRE NONE doesn't unset SSL requirements
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql-bench/server-cfg.sh')
| -rw-r--r-- | sql-bench/server-cfg.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql-bench/server-cfg.sh b/sql-bench/server-cfg.sh index d1205d55842..e53190a75ec 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,$socket)=@_; + my ($name,$host,$database,$odbc,$machine,$socket,$connect_options)=@_; my ($server); if ($name =~ /mysql/i) - { $server=new db_MySQL($host, $database, $machine, $socket); } + { $server=new db_MySQL($host, $database, $machine, $socket,$connect_options); } elsif ($name =~ /pg/i) { $server= new db_Pg($host,$database); } elsif ($name =~ /msql/i) @@ -106,7 +106,7 @@ package db_MySQL; sub new { - my ($type,$host,$database,$machine,$socket)= @_; + my ($type,$host,$database,$machine,$socket,$connect_options)= @_; my $self= {}; my %limits; bless $self; @@ -114,6 +114,7 @@ sub new $self->{'cmp_name'} = "mysql"; $self->{'data_source'} = "DBI:mysql:database=$database;host=$host"; $self->{'data_source'} .= ";mysql_socket=$socket" if($socket); + $self->{'data_source'} .= ";$connect_options" if($connect_options); $self->{'limits'} = \%limits; $self->{'smds'} = \%smds; $self->{'blob'} = "blob"; |