Merge bk-internal:/home/bk/mysql-5.0-maint (73a7995b) · Commits · Software / OSDI20 Artifacts / mariadb

client/mysqltest.c

+18 −18

Original line number	Diff line number	Diff line
		@@ -1409,7 +1409,7 @@ int open_file(const char *name)

		void do_source(struct st_command *command)
		{
		DYNAMIC_STRING ds_filename;
		static DYNAMIC_STRING ds_filename;
		const struct command_arg source_args[] = {
		"filename", ARG_STRING, TRUE, &ds_filename, "File to source"
		};
		@@ -1697,7 +1697,7 @@ void do_system(struct st_command *command)
		void do_remove_file(struct st_command *command)
		{
		int error;
		DYNAMIC_STRING ds_filename;
		static DYNAMIC_STRING ds_filename;
		const struct command_arg rm_args[] = {
		"filename", ARG_STRING, TRUE, &ds_filename, "File to delete"
		};
		@@ -1730,8 +1730,8 @@ void do_remove_file(struct st_command *command)
		void do_copy_file(struct st_command *command)
		{
		int error;
		DYNAMIC_STRING ds_from_file;
		DYNAMIC_STRING ds_to_file;
		static DYNAMIC_STRING ds_from_file;
		static DYNAMIC_STRING ds_to_file;
		const struct command_arg copy_file_args[] = {
		"from_file", ARG_STRING, TRUE, &ds_from_file, "Filename to copy from",
		"to_file", ARG_STRING, TRUE, &ds_to_file, "Filename to copy to"
		@@ -1766,7 +1766,7 @@ void do_copy_file(struct st_command *command)
		void do_file_exist(struct st_command *command)
		{
		int error;
		DYNAMIC_STRING ds_filename;
		static DYNAMIC_STRING ds_filename;
		const struct command_arg file_exist_args[] = {
		"filename", ARG_STRING, TRUE, &ds_filename, "File to check if it exist"
		};
		@@ -1873,9 +1873,9 @@ void read_until_delimiter(DYNAMIC_STRING *ds,

		void do_write_file(struct st_command *command)
		{
		DYNAMIC_STRING ds_content;
		DYNAMIC_STRING ds_filename;
		DYNAMIC_STRING ds_delimiter;
		static DYNAMIC_STRING ds_content;
		static DYNAMIC_STRING ds_filename;
		static DYNAMIC_STRING ds_delimiter;
		const struct command_arg write_file_args[] = {
		"filename", ARG_STRING, TRUE, &ds_filename, "File to write to",
		"delimiter", ARG_STRING, FALSE, &ds_delimiter, "Delimiter to read until"
		@@ -1927,8 +1927,8 @@ void do_perl(struct st_command *command)
		int error;
		char buf[FN_REFLEN];
		FILE *res_file;
		DYNAMIC_STRING ds_script;
		DYNAMIC_STRING ds_delimiter;
		static DYNAMIC_STRING ds_script;
		static DYNAMIC_STRING ds_delimiter;
		const struct command_arg perl_args[] = {
		"delimiter", ARG_STRING, FALSE, &ds_delimiter, "Delimiter to read until"
		};
		@@ -2985,14 +2985,14 @@ void do_connect(struct st_command *command)
		bool con_ssl= 0, con_compress= 0;
		char *ptr;

		DYNAMIC_STRING ds_connection_name;
		DYNAMIC_STRING ds_host;
		DYNAMIC_STRING ds_user;
		DYNAMIC_STRING ds_password;
		DYNAMIC_STRING ds_database;
		DYNAMIC_STRING ds_port;
		DYNAMIC_STRING ds_sock;
		DYNAMIC_STRING ds_options;
		static DYNAMIC_STRING ds_connection_name;
		static DYNAMIC_STRING ds_host;
		static DYNAMIC_STRING ds_user;
		static DYNAMIC_STRING ds_password;
		static DYNAMIC_STRING ds_database;
		static DYNAMIC_STRING ds_port;
		static DYNAMIC_STRING ds_sock;
		static DYNAMIC_STRING ds_options;
		const struct command_arg connect_args[] = {
		"connection name", ARG_STRING, TRUE, &ds_connection_name,
		"Name of the connection",

mysql-test/include/wait_for_query_to_suceed.inc

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		#
		# Run a query over and over until it suceeds ot timeout occurs
		#


		let $counter= 100;

		disable_abort_on_error;
		disable_query_log;
		disable_result_log;
		eval $query;
		while ($mysql_errno)
		{
		eval $query;
		sleep 0.1;
		dec $counter;

		if (!$counter)
		{
		die("Waited too long for query to suceed");
		}
		}
		enable_abort_on_error;
		enable_query_log;
		enable_result_log;

mysql-test/lib/mtr_io.pl

+5 −7

Original line number	Diff line number	Diff line
		@@ -37,18 +37,16 @@ sub mtr_get_pid_from_file ($) {
		open(FILE, '<', $pid_file_path)
		or mtr_error("can't open file \"$pid_file_path\": $!");

		# Read pid number from file
		my $pid= <FILE>;

		chomp($pid) if defined $pid;

		close FILE;

		return $pid if defined $pid && $pid ne '';
		return $pid if $pid=~ /^(\d+)/;

		mtr_debug("Pid file '$pid_file_path' is empty. " .
		"Sleeping $timeout second(s)...");
		mtr_debug("Pid file '$pid_file_path' does not yet contain pid number.\n" .
		"Sleeping $timeout second(s) more...");

		sleep(1);
		sleep($timeout);
		}

		mtr_error("Pid file '$pid_file_path' is corrupted. " .

mysql-test/lib/mtr_process.pl

+25 −15

Original line number	Diff line number	Diff line
		@@ -438,6 +438,10 @@ sub mtr_kill_leftovers () {

		while ( my $elem= readdir(RUNDIR) )
		{
		# Only read pid from files that end with .pid
		if ( $elem =~ /.*[.]pid$/)
		{

		my $pidfile= "$rundir/$elem";

		if ( -f $pidfile )
		@@ -459,6 +463,12 @@ sub mtr_kill_leftovers () {
		}
		}
		}
		else
		{
		mtr_warning("Found non pid file $elem in $rundir");
		next;
		}
		}
		closedir(RUNDIR);

		if ( @pids )

mysql-test/mysql-test-run.pl

+10 −8

Original line number	Diff line number	Diff line
		@@ -1801,14 +1801,16 @@ sub environment_setup () {
		# ----------------------------------------------------
		# Setup env so childs can execute mysql_fix_system_tables
		# ----------------------------------------------------
		if ( ! $glob_win32 )
		{
		my $cmdline_mysql_fix_system_tables=
		"$exe_mysql_fix_system_tables --no-defaults --host=localhost " .
		"--user=root --password= " .
		"--basedir=$glob_basedir --bindir=$path_client_bindir --verbose " .
		"--port=$master->[0]->{'port'} " .
		"--socket=$master->[0]->{'path_sock'}";

		$ENV{'MYSQL_FIX_SYSTEM_TABLES'}= $cmdline_mysql_fix_system_tables;
		}

		# ----------------------------------------------------
		# Setup env so childs can execute my_print_defaults