Commit 808d87f8 authored by gluh@gluh.(none)'s avatar gluh@gluh.(none)
Browse files

Some changes for SSL

parent 48b0cdc4

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ bar@bar.udmsearch.izhnet.ru 
bell@sanja.is.com.ua

bk@admin.bk

davida@isil.mysql.com

gluh@gluh.(none)

heikki@donna.mysql.fi

heikki@hundin.mysql.fi

heikki@rescue.

sql-bench/bench-init.pl.sh

+8 −4
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ require "$pwd/server-cfg" || die "Can't read Configuration file: $!\n"; 
$|=1;				# Output data immediately



$opt_skip_test=$opt_skip_create=$opt_skip_delete=$opt_verbose=$opt_fast_insert=$opt_lock_tables=$opt_debug=$opt_skip_delete=$opt_fast=$opt_force=$opt_log=$opt_use_old_results=$opt_help=$opt_odbc=$opt_small_test=$opt_small_tables=$opt_samll_key_tables=$opt_stage=$opt_old_headers=$opt_die_on_errors=$opt_tcpip=$opt_random=0;

$opt_cmp=$opt_user=$opt_password="";

$opt_cmp=$opt_user=$opt_password=$opt_connect_options="";

$opt_server="mysql"; $opt_dir="output";

$opt_host="localhost";$opt_database="test";

$opt_machine=""; $opt_suffix="";
@@ -55,11 +55,11 @@ $log_prog_args=join(" ", skip_arguments(\@ARGV,"comments","cmp","server", 
					"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") || 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","threads=i","random","old-headers","die-on-errors","create-options=s","hires","tcpip","silent","optimization=s","hw=s","socket=s","connect-options=s") || usage();



usage() if ($opt_help);

$server=get_server($opt_server,$opt_host,$opt_database,$opt_odbc,

                   machine_part(), $opt_socket);

                   machine_part(), $opt_socket, $opt_connect_options);

$limits=merge_limits($server,$opt_cmp);

$date=date();

@estimated=(0.0,0.0,0.0);		# For estimated time support
@@ -594,6 +594,10 @@ All benchmarks takes the following options: 
--hw='some comments'

 Add coments about hardware used for this test.



--connect-options='some connect options'

  Add options, which uses at DBI connect.

  For example --connect-options=mysql_read_default_file=/etc/my.cnf.



EOF

  exit(0);

}

sql-bench/server-cfg.sh

+4 −3
Original line number Diff line number Diff line
@@ -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";

sql/sql_acl.cc

+7 −2
Original line number Diff line number Diff line
@@ -1348,8 +1348,13 @@ static int replace_user_table(THD *thd, TABLE *table, const LEX_USER &combo, 
				strlen(thd->lex.x509_subject));

      break;

    case SSL_TYPE_NOT_SPECIFIED:

    case SSL_TYPE_NONE:				// Impossible

      break;					// Nothing to do

      break;

    case SSL_TYPE_NONE:

      table->field[24]->store("",0);

      table->field[25]->store("",0);

      table->field[26]->store("",0);

      table->field[27]->store("",0);

      break;

    }



    USER_RESOURCES mqh = thd->lex.mqh;