Merge bk-internal:/home/bk/mysql-5.1-new-maint (cca28984) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/lib/mtr_cases.pl

+11 −0

Original line number	Diff line number	Diff line
		@@ -498,6 +498,17 @@ sub collect_one_test_case($$$$$$$) {
		{
		mtr_options_from_test_file($tinfo,"$testdir/${tname}.test");

		if ( defined $::used_default_engine )
		{
		# Different default engine is used
		# tag test to require that engine
		$tinfo->{'ndb_test'}= 1
		if ( $::used_default_engine =~ /^ndb/i );

		$tinfo->{'innodb_test'}= 1
		if ( $::used_default_engine =~ /^innodb/i );
		}

		if ( $tinfo->{'big_test'} and ! $::opt_big_test )
		{
		$tinfo->{'skip'}= 1;

mysql-test/mysql-test-run.pl

+23 −6

Original line number	Diff line number	Diff line
		@@ -305,6 +305,7 @@ our $path_sql_dir;
		our @data_dir_lst;

		our $used_binlog_format;
		our $used_default_engine;
		our $debug_compiled_binaries;
		our $glob_tot_real_time= 0;

		@@ -520,7 +521,7 @@ sub command_line_setup () {
		'compress' => \$opt_compress,
		'bench' => \$opt_bench,
		'small-bench' => \$opt_small_bench,
		'with-ndbcluster' => \$opt_with_ndbcluster,
		'with-ndbcluster\|ndb' => \$opt_with_ndbcluster,
		'vs-config' => \$opt_vs_config,

		# Control what test suites or cases to run
		@@ -777,6 +778,26 @@ sub command_line_setup () {
		mtr_report("Using binlog format '$used_binlog_format'");
		}


		# --------------------------------------------------------------------------
		# Find out default storage engine being used(if any)
		# --------------------------------------------------------------------------
		if ( $opt_with_ndbcluster )
		{
		# --ndb or --with-ndbcluster turns on --default-storage-engine=ndbcluster
		push(@opt_extra_mysqld_opt, "--default-storage-engine=ndbcluster");
		}

		foreach my $arg ( @opt_extra_mysqld_opt )
		{
		if ( $arg =~ /default-storage-engine=(\S+)/ )
		{
		$used_default_engine= $1;
		}
		}
		mtr_report("Using default engine '$used_default_engine'")
		if defined $used_default_engine;

		# --------------------------------------------------------------------------
		# Check if we should speed up tests by trying to run on tmpfs
		# --------------------------------------------------------------------------
		@@ -902,10 +923,6 @@ sub command_line_setup () {
		# --------------------------------------------------------------------------
		# Ndb cluster flags
		# --------------------------------------------------------------------------
		if ( $opt_with_ndbcluster and !$opt_bench)
		{
		mtr_error("Can only use --with-ndbcluster together with --bench");
		}

		if ( $opt_ndbconnectstring )
		{
		@@ -5037,7 +5054,7 @@ Options to control what engine/variation to run
		skip-ssl Dont start server with support for ssl connections
		bench Run the benchmark suite
		small-bench Run the benchmarks with --small-tests --small-tables
		with-ndbcluster Use cluster as default table type for benchmark
		ndb\|with-ndbcluster Use cluster as default table type
		vs-config Visual Studio configuration used to create executables
		(default: MTR_VS_CONFIG environment variable)

mysql-test/r/openssl_1.result

+2 −0

Original line number	Diff line number	Diff line
		@@ -51,3 +51,5 @@ SSL error: Unable to get private key from ''
		mysqltest: Could not open connection 'default': 2026 SSL connection error
		SSL error: Unable to get certificate from ''
		mysqltest: Could not open connection 'default': 2026 SSL connection error
		Variable_name Value
		Ssl_cipher DHE-RSA-AES256-SHA

mysql-test/t/openssl_1.test

+8 −1

Original line number	Diff line number	Diff line
		@@ -96,4 +96,11 @@ drop table t1;
		--error 1
		--exec $MYSQL_TEST --ssl-cert= --max-connect-retries=1 < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1


		#
		# Bug#25309 SSL connections without CA certificate broken since MySQL 5.0.23
		#
		# Test that we can open encrypted connection to server without
		# verification of servers certificate by setting both ca certificate
		# and ca path to NULL
		#
		--exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1

vio/viosslfactories.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -309,6 +309,14 @@ new_VioSSLConnectorFd(const char key_file, const char cert_file,
		{
		struct st_VioSSLFd *ssl_fd;
		int verify= SSL_VERIFY_PEER;

		/*
		Turn off verification of servers certificate if both
		ca_file and ca_path is set to NULL
		*/
		if (ca_file == 0 && ca_path == 0)
		verify= SSL_VERIFY_NONE;

		if (!(ssl_fd= new_VioSSLFd(key_file, cert_file, ca_file,
		ca_path, cipher, TLSv1_client_method())))
		{