Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint (8f93a6c9) · Commits · Software / OSDI20 Artifacts / mariadb

client/mysql_upgrade.c

+21 −14

Original line number	Diff line number	Diff line
		@@ -31,10 +31,12 @@
		const char *mysqlcheck_name= "mysqlcheck.exe";
		const char *mysql_name= "mysql.exe";
		const char *mysqld_name= "mysqld.exe";
		#define EXTRA_CLIENT_PATHS "client/release", "client/debug"
		#else
		const char *mysqlcheck_name= "mysqlcheck";
		const char *mysql_name= "mysql";
		const char *mysqld_name= "mysqld";
		#define EXTRA_CLIENT_PATHS "client"
		#endif /__WIN__/

		extern TYPELIB sql_protocol_typelib;
		@@ -497,7 +499,8 @@ int main(int argc, char **argv)
		"mysql", NullS))
		{
		ret= 1;
		puts("Can't find data directory. Please restart with"
		fprintf(stderr,
		"Can't find data directory. Please restart with"
		" --datadir=path-to-writable-data-dir");
		goto error;
		}
		@@ -541,11 +544,13 @@ int main(int argc, char **argv)
		}

		if (find_file(mysqlcheck_name, basedir, MYF(0), path, sizeof(path),
		"bin", "client", NullS))
		"bin", EXTRA_CLIENT_PATHS, NullS))
		{
		ret= 1;
		printf("Can't find program '%s'\n", mysqlcheck_name);
		puts("Please restart with --basedir=mysql-install-directory");
		fprintf(stderr,
		"Can't find program '%s'\n"
		"Please restart with --basedir=mysql-install-directory",
		mysqlcheck_name);
		goto error;
		}
		else
		@@ -567,7 +572,7 @@ int main(int argc, char **argv)
		ret= system(cmdline.str);
		if (ret)
		{
		printf("Error executing '%s'\n", cmdline.str);
		fprintf(stderr, "Error executing '%s'\n", cmdline.str);
		goto error;
		}

		@@ -578,10 +583,11 @@ int main(int argc, char **argv)

		fix_priv_tables:
		if (find_file(mysql_name, basedir, MYF(0), path, sizeof(path),
		"bin", "client", NullS))
		"bin", EXTRA_CLIENT_PATHS, NullS))
		{
		ret= 1;
		puts("Could not find MySQL command-line client (mysql).\n"
		fprintf(stderr,
		"Could not find MySQL command-line client (mysql).\n"
		"Please use --basedir to specify the directory"
		" where MySQL is installed.");
		goto error;
		@@ -598,7 +604,8 @@ int main(int argc, char **argv)
		"share/mysql", NullS))
		{
		ret= 1;
		puts("Could not find file " MYSQL_FIX_PRIV_TABLES_NAME "\n"
		fprintf(stderr,
		"Could not find file " MYSQL_FIX_PRIV_TABLES_NAME "\n"
		"Please use --basedir to specify the directory"
		" where MySQL is installed");
		goto error;
		@@ -621,7 +628,7 @@ int main(int argc, char **argv)

		ret= system(cmdline.str);
		if (ret)
		printf("Error executing '%s'\n", cmdline.str);
		fprintf(stderr, "Error executing '%s'\n", cmdline.str);

		error:
		dynstr_free(&cmdline);

client/mysqltest.c

+12 −6

Original line number	Diff line number	Diff line
		@@ -4138,8 +4138,9 @@ void init_win_path_patterns()
		/* List of string patterns to match in order to find paths */
		const char* paths[] = { "$MYSQL_TEST_DIR",
		"$MYSQL_TMP_DIR",
		"./test/", 0 };
		int num_paths= 3;
		"$MYSQLTEST_VARDIR",
		"./test/" };
		int num_paths= sizeof(paths)/sizeof(char*);
		int i;
		char* p;

		@@ -4159,6 +4160,13 @@ void init_win_path_patterns()
		else
		p= my_strdup(paths[i], MYF(MY_FAE));

		/* Don't insert zero length strings in patterns array */
		if (strlen(p) == 0)
		{
		my_free(p, MYF(0));
		continue;
		}

		if (insert_dynamic(&patterns, (gptr) &p))
		die(NullS);

		@@ -4208,7 +4216,7 @@ void fix_win_paths(const char *val, int len)
		{
		const char pattern= dynamic_element(&patterns, i, const char);
		DBUG_PRINT("info", ("pattern: %s", *pattern));
		if (strlen(*pattern) == 0) continue;

		/* Search for the path in string */
		while ((p= strstr(val, *pattern)))
		{
		@@ -6448,7 +6456,7 @@ int reg_replace(char** buf_p, int* buf_len_p, char *pattern,
		{
		my_regex_t r;
		my_regmatch_t *subs;
		char buf_end, replace_end;
		char *replace_end;
		char buf= buf_p;
		int len;
		int buf_len, need_buf_len;
		@@ -6468,8 +6476,6 @@ int reg_replace(char** buf_p, int* buf_len_p, char *pattern,

		SECURE_REG_BUF

		buf_end= buf + buf_len;

		if (icase)
		cflags\|= REG_ICASE;

mysql-test/lib/mtr_report.pl

+6 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,12 @@ sub mtr_verbose (@);
		# We can't use diff -u or diff -a as these are not portable

		sub mtr_show_failed_diff ($) {
		my $tname= shift;
		my $result_file_name= shift;

		# The reject and log files have been dumped to
		# to filenames based on the result_file's name
		my $tname= basename($result_file_name);
		$tname=~ s/\..*$//;

		my $reject_file= "r/$tname.reject";
		my $result_file= "r/$tname.result";

mysql-test/mysql-test-run.pl

+6 −1

Original line number	Diff line number	Diff line
		@@ -151,6 +151,7 @@ our $exe_mysqlslap;
		our $exe_mysqlimport;
		our $exe_mysqlshow;
		our $exe_mysql_fix_system_tables;
		our $file_mysql_fix_privilege_tables;
		our $exe_mysqltest;
		our $exe_ndbd;
		our $exe_ndb_mgmd;
		@@ -1414,6 +1415,9 @@ sub executable_setup () {
		"$path_client_bindir/mysql_fix_privilege_tables");
		}

		# Look for mysql_fix_privilege_tables.sql script
		$file_mysql_fix_privilege_tables=
		mtr_file_exists("$glob_basedir/scripts/mysql_fix_privilege_tables.sql");

		if ( ! $opt_skip_ndbcluster and executable_setup_ndb())
		{
		@@ -1836,6 +1840,7 @@ sub environment_setup () {
		"--socket=$master->[0]->{'path_sock'}";
		$ENV{'MYSQL_FIX_SYSTEM_TABLES'}= $cmdline_mysql_fix_system_tables;
		}
		$ENV{'MYSQL_FIX_PRIVILEGE_TABLES'}= $file_mysql_fix_privilege_tables;

		# ----------------------------------------------------
		# Setup env so childs can execute my_print_defaults
		@@ -3259,7 +3264,7 @@ sub report_failure_and_restart ($) {
		my $tinfo= shift;

		mtr_report_test_failed($tinfo);
		mtr_show_failed_diff($tinfo->{'name'});
		mtr_show_failed_diff($tinfo->{'result_file'});
		print "\n";
		if ( $opt_force )
		{

mysql-test/t/system_mysql_db_fix-master.opt→mysql-test/t/system_mysql_db_fix30020-master.opt

+0 −0

File moved.

View file