Merge bk-internal:/home/bk/mysql-5.0 (51cdfd34) · Commits · Software / OSDI20 Artifacts / mariadb

client/mysql_upgrade.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -40,6 +40,8 @@ static DYNAMIC_STRING ds_args;
		static char *opt_password= 0;
		static my_bool tty_password= 0;

		static char opt_tmpdir[FN_REFLEN];

		#ifndef DBUG_OFF
		static char default_dbug_option= (char) "d:t:O,/tmp/mysql_upgrade.trace";
		#endif
		@@ -105,6 +107,8 @@ static struct my_option my_long_options[]=
		#endif
		{"socket", 'S', "Socket file to use for connection.",
		0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
		{"tmpdir", 't', "Directory for temporary files",
		0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
		{"user", 'u', "User for login if not current user.", (gptr*) &opt_user,
		(gptr*) &opt_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
		#include <sslopt-longopts.h>
		@@ -229,6 +233,11 @@ get_one_option(int optid, const struct my_option *opt,
		}
		break;

		case 't':
		strnmov(opt_tmpdir, argument, sizeof(opt_tmpdir));
		add_option= FALSE;
		break;

		case 'b': /* --basedir */
		case 'v': /* --verbose */
		case 'd': /* --datadir */
		@@ -449,7 +458,7 @@ static int run_query(const char query, DYNAMIC_STRING ds_res,
		char query_file_path[FN_REFLEN];
		DBUG_ENTER("run_query");
		DBUG_PRINT("enter", ("query: %s", query));
		if ((fd= create_temp_file(query_file_path, NULL,
		if ((fd= create_temp_file(query_file_path, opt_tmpdir,
		"sql", O_CREAT \| O_SHARE \| O_RDWR,
		MYF(MY_WME))) < 0)
		die("Failed to create temporary file for defaults");

+2 −1

Original line number	Diff line number	Diff line
		@@ -1536,7 +1536,7 @@ int dyn_string_cmp(DYNAMIC_STRING* ds, const char *fname)
		DBUG_ENTER("dyn_string_cmp");
		DBUG_PRINT("enter", ("fname: %s", fname));

		if ((fd= create_temp_file(temp_file_path, NULL,
		if ((fd= create_temp_file(temp_file_path, TMPDIR,
		"tmp", O_CREAT \| O_SHARE \| O_RDWR,
		MYF(MY_WME))) < 0)
		die("Failed to create temporary file for ds");
		@@ -5464,6 +5464,7 @@ void init_win_path_patterns()
		const char* paths[] = { "$MYSQL_TEST_DIR",
		"$MYSQL_TMP_DIR",
		"$MYSQLTEST_VARDIR",
		"$MASTER_MYSOCK",
		"./test/" };
		int num_paths= sizeof(paths)/sizeof(char*);
		int i;

+1 −1

Original line number	Diff line number	Diff line
		@@ -493,7 +493,7 @@ static void DbugParse(CODE_STATE cs, const char control)
		}

		end= DbugStrTok(control);
		while (1)
		while (control < end)
		{
		int c, sign= (control == '+') ? 1 : (control == '-') ? -1 : 0;
		if (sign) control++;

+6 −2

Original line number	Diff line number	Diff line
		@@ -533,8 +533,12 @@ C_MODE_END
		#undef DBUG_OFF
		#endif

		#if defined(_lint) && !defined(DBUG_OFF)
		/* We might be forced to turn debug off, if not turned off already */
		#if (defined(FORCE_DBUG_OFF) \|\| defined(_lint)) && !defined(DBUG_OFF)
		# define DBUG_OFF
		# ifdef DBUG_ON
		# undef DBUG_ON
		# endif
		#endif

		#include <my_dbug.h>

+11 −2

Original line number	Diff line number	Diff line
		@@ -1367,7 +1367,15 @@ sub datadir_list_setup () {

		sub collect_mysqld_features () {
		my $found_variable_list_start= 0;
		my $tmpdir= tempdir(CLEANUP => 0); # Directory removed by this function
		my $tmpdir;
		if ( $opt_tmpdir ) {
		# Use the requested tmpdir
		mkpath($opt_tmpdir) if (! -d $opt_tmpdir);
		$tmpdir= $opt_tmpdir;
		}
		else {
		$tmpdir= tempdir(CLEANUP => 0); # Directory removed by this function
		}

		#
		# Execute "mysqld --no-defaults --help --verbose" to get a
		@@ -1428,7 +1436,7 @@ sub collect_mysqld_features () {
		}
		}
		}
		rmtree($tmpdir);
		rmtree($tmpdir) if (!$opt_tmpdir);
		mtr_error("Could not find version of MySQL") unless $mysql_version_id;
		mtr_error("Could not find variabes list") unless $found_variable_list_start;

		@@ -1737,6 +1745,7 @@ sub mysql_upgrade_arguments()
		mtr_add_arg($args, "--socket=$master->[0]->{'path_sock'}");
		mtr_add_arg($args, "--datadir=$master->[0]->{'path_myddir'}");
		mtr_add_arg($args, "--basedir=$glob_basedir");
		mtr_add_arg($args, "--tmpdir=$opt_tmpdir");

		if ( $opt_debug )
		{