Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new (a754f1be) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/lib/mtr_stress.pl

+0 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ sub run_stress_test ()
		{

		my $args;
		my $stress_basedir;
		my $stress_suitedir;

		mtr_report("Starting stress testing\n");

mysql-test/mysql-test-run.pl

+13 −20

Original line number	Diff line number	Diff line
		@@ -166,7 +166,6 @@ our $path_my_basedir;
		our $opt_vardir; # A path but set directly on cmd line
		our $opt_vardir_trace; # unix formatted opt_vardir for trace files
		our $opt_tmpdir; # A path but set directly on cmd line
		our $opt_restart_cleanup; # Source a file with SQL drop statements

		our $opt_usage;
		our $opt_suite;
		@@ -588,16 +587,18 @@ sub command_line_setup () {
		'with-ndbcluster-only' => \$opt_with_ndbcluster_only,
		'ndb-extra-test' => \$opt_ndb_extra_test,
		'do-test=s' => \$opt_do_test,
		'start-from=s' => \$opt_start_from,
		'suite=s' => \$opt_suite,
		'skip-rpl' => \$opt_skip_rpl,
		'skip-im' => \$opt_skip_im,
		'skip-test=s' => \$opt_skip_test,
		'big-test' => \$opt_big_test,

		# Specify ports
		'master_port=i' => \$opt_master_myport,
		'slave_port=i' => \$opt_slave_myport,
		'ndbcluster_port=i' => \$opt_ndbcluster_port,
		'ndbcluster_port_slave=i' => \$opt_ndbcluster_port_slave,
		'ndbcluster-port=i' => \$opt_ndbcluster_port,
		'ndbcluster-port-slave=i' => \$opt_ndbcluster_port_slave,
		'manager-port=i' => \$opt_manager_port, # Currently not used
		'im-port=i' => \$im_port, # Instance Manager port.
		'im-mysqld1-port=i' => \$im_mysqld1_port, # Port of mysqld, controlled by IM
		@@ -607,13 +608,13 @@ sub command_line_setup () {
		'record' => \$opt_record,
		'check-testcases' => \$opt_check_testcases,

		# ???
		# Extra options used when starting mysqld
		'mysqld=s' => \@opt_extra_mysqld_opt,

		# Run test on running server
		'extern' => \$opt_extern,
		'ndbconnectstring=s' => \$opt_ndbconnectstring,
		'ndbconnectstring-slave=s' => \$opt_ndbconnectstring_slave,
		'ndb-connectstring=s' => \$opt_ndbconnectstring,
		'ndb-connectstring-slave=s' => \$opt_ndbconnectstring_slave,

		# Debugging
		'gdb' => \$opt_gdb,
		@@ -652,7 +653,6 @@ sub command_line_setup () {
		'vardir=s' => \$opt_vardir,

		# Misc
		'big-test' => \$opt_big_test,
		'comment=s' => \$opt_comment,
		'debug' => \$opt_debug,
		'fast' => \$opt_fast,
		@@ -661,13 +661,11 @@ sub command_line_setup () {
		'netware' => \$opt_netware,
		'old-master' => \$opt_old_master,
		'reorder' => \$opt_reorder,
		'restart-cleanup' => \$opt_restart_cleanup,
		'script-debug' => \$opt_script_debug,
		'sleep=i' => \$opt_sleep,
		'socket=s' => \$opt_socket,
		'start-dirty' => \$opt_start_dirty,
		'start-and-exit' => \$opt_start_and_exit,
		'start-from=s' => \$opt_start_from,
		'timer' => \$opt_timer,
		'unified-diff\|udiff' => \$opt_udiff,
		'user-test=s' => \$opt_user_test,
		@@ -3260,12 +3258,6 @@ sub run_mysqltest ($) {
		mtr_add_arg($args, "--sleep=%d", $opt_sleep);
		}

		if ( $opt_restart_cleanup and $glob_mysqld_restart )
		{
		mtr_add_arg($args, "--include=%s", "include/drop-on-restart.inc");
		$glob_mysqld_restart= 0;
		}

		if ( $opt_debug )
		{
		mtr_add_arg($args, "--debug=d:t:A,%s/log/mysqltest.trace", $opt_vardir_trace);
		@@ -3561,12 +3553,15 @@ Options to control what test suites or cases to run
		skip-rpl Skip the replication test cases.
		skip-im Don't start IM, and skip the IM test cases
		skip-test=PREFIX Skip test cases which name are prefixed with PREFIX
		big-test Pass "--big-test" to mysqltest which will set the environment
		variable BIG_TEST, which can be checked from test cases.

		Options that specify ports

		master_port=PORT Specify the port number used by the first master
		slave_port=PORT Specify the port number used by the first slave
		ndbcluster_port=PORT Specify the port number used by cluster
		ndbcluster-port=PORT Specify the port number used by cluster
		ndbcluster-port-slave=PORT Specify the port number used by slave cluster

		Options for test case authoring

		@@ -3620,16 +3615,14 @@ Misc options
		help Get this help text
		unified-diff \| udiff When presenting differences, use unified diff

		testcase-timeout=MINUTES Max test case run time (default 5)
		suite-timeout=MINUTES Max test suite run time (default 120)
		testcase-timeout=MINUTES Max test case run time (default $default_testcase_timeout)
		suite-timeout=MINUTES Max test suite run time (default $default_suite_timeout)

		Deprecated options
		with-openssl Deprecated option for ssl


		Options not yet described, or that I want to look into more

		big-test
		debug
		local
		local-master

sql/ha_heap.cc

+0 −1

Original line number	Diff line number	Diff line
		@@ -524,7 +524,6 @@ THR_LOCK_DATA *ha_heap::store_lock(THD thd,

		int ha_heap::delete_table(const char *name)
		{
		char buff[FN_REFLEN];
		int error= heap_delete_table(name);
		return error == ENOENT ? 0 : error;
		}

sql/ha_ndbcluster.cc

+6 −1

Original line number	Diff line number	Diff line
		@@ -3397,6 +3397,7 @@ int ha_ndbcluster::rnd_pos(byte buf, byte pos)
		The partition id has been fetched from ndb
		and has been stored directly after the hidden key
		*/
		DBUG_DUMP("key+part", (char *)pos, key_length);
		key_length= ref_length - sizeof(m_part_id);
		part_spec.start_part= part_spec.end_part= *(pos + key_length);
		}
		@@ -3413,6 +3414,7 @@ int ha_ndbcluster::rnd_pos(byte buf, byte pos)
		}
		DBUG_PRINT("info", ("partition id %u", part_spec.start_part));
		}
		DBUG_DUMP("key", (char *)pos, key_length);
		DBUG_RETURN(pk_read(pos, key_length, buf, part_spec.start_part));
		}
		}
		@@ -3498,7 +3500,10 @@ void ha_ndbcluster::position(const byte *record)
		#endif
		memcpy(ref, m_ref, key_length);
		}

		#ifndef DBUG_OFF
		if (table_share->primary_key == MAX_KEY && m_use_partition_function)
		DBUG_DUMP("key+part", (char*)ref, key_length+sizeof(m_part_id));
		#endif
		DBUG_DUMP("ref", (char*)ref, key_length);
		DBUG_VOID_RETURN;
		}

sql/handler.cc

+0 −2

Original line number	Diff line number	Diff line
		@@ -445,8 +445,6 @@ static my_bool init_handlerton(THD unused1, st_plugin_int plugin,
		int ha_init()
		{
		int error= 0;
		handlerton **types;
		show_table_alias_st *table_alias;
		total_ha= savepoint_alloc_size= 0;

		if (ha_init_errors())