Merging latest changes. (c4901673) · Commits · Software / OSDI20 Artifacts / mariadb

BUILD/check-cpu

+1 −1

Original line number	Diff line number	Diff line
		@@ -176,7 +176,7 @@ check_cpu () {
		fi

		cc_ver=`$cc --version \| sed 1q`
		cc_verno=`echo $cc_ver \| sed -e 's/^.gcc/gcc/g; s/[^0-9. ]//g; s/^ //g; s/ .*//g'`
		cc_verno=`echo $cc_ver \| sed -e 's/^.(GCC)//g; s/[^0-9. ]//g; s/^ //g; s/ .*//g'`
		set -- `echo $cc_verno \| tr '.' ' '`
		cc_major=$1
		cc_minor=$2

Makefile.am

+2 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ bin-dist: all
		$(top_builddir)/scripts/make_binary_distribution @MAKE_BINARY_DISTRIBUTION_OPTIONS@

		# Remove BK's "SCCS" subdirectories from source distribution
		# Create initial database files for Windows installations.
		# Create initial database files for Windows installations and check them.
		dist-hook:
		rm -rf `find $(distdir) -type d -name SCCS -print`
		mkdir -p $(distdir)/win
		@@ -57,6 +57,7 @@ dist-hook:
		--builddir=$(top_builddir) \
		--datadir=$(distdir)/win/data \
		--srcdir=$(top_srcdir)
		storage/myisam/myisamchk --silent --fast $(distdir)/win/data/mysql/*.MYI

		tags:
		support-files/build-tags

client/Makefile.am

+3 −2

Original line number	Diff line number	Diff line
		@@ -88,11 +88,12 @@ mysqlslap_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \

		mysqltest_SOURCES= mysqltest.c
		mysqltest_CFLAGS= -DTHREAD -UUNDEF_THREADS_HACK
		mysqltest_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
		mysqltest_LDADD = $(CXXLDFLAGS) \
		@CLIENT_EXTRA_LDFLAGS@ \
		$(LIBMYSQLCLIENT_LA) \
		$(top_builddir)/mysys/libmysys.a \
		$(top_builddir)/regex/libregex.a
		$(top_builddir)/regex/libregex.a \
		$(CLIENT_THREAD_LIBS)

		mysql_upgrade_SOURCES= mysql_upgrade.c \
		$(top_srcdir)/mysys/my_getpagesize.c

client/mysql_upgrade.c

+56 −83

Original line number	Diff line number	Diff line
		@@ -269,6 +269,10 @@ get_one_option(int optid, const struct my_option *opt,
		}


		/**
		Run a command using the shell, storing its output in the supplied dynamic
		string.
		*/
		static int run_command(char* cmd,
		DYNAMIC_STRING *ds_res)
		{
		@@ -341,37 +345,15 @@ static int run_tool(char tool_path, DYNAMIC_STRING ds_res, ...)
		}


		/*
		Try to get the full path to this exceutable

		Return 0 if path found

		/**
		Look for the filename of given tool, with the presumption that it is in the
		same directory as mysql_upgrade and that the same executable-searching
		mechanism will be used when we run our sub-shells with popen() later.
		*/

		static my_bool get_full_path_to_executable(char* path)
		static void find_tool(char tool_executable_name, const char tool_name,
		const char *self_name)
		{
		my_bool ret;
		DBUG_ENTER("get_full_path_to_executable");
		#ifdef __WIN__
		ret= (GetModuleFileName(NULL, path, FN_REFLEN) == 0);
		#else
		/* my_readlink returns 0 if a symlink was read */
		ret= (my_readlink(path, "/proc/self/exe", MYF(0)) != 0);
		/* Might also want to try with /proc/$$/exe if the above fails */
		#endif
		DBUG_PRINT("exit", ("path: %s", path));
		DBUG_RETURN(ret);
		}


		/*
		Look for the tool in the same directory as mysql_upgrade.
		*/

		static void find_tool(char tool_path, const char tool_name)
		{
		size_t path_len;
		char path[FN_REFLEN];
		char *last_fn_libchar;
		DYNAMIC_STRING ds_tmp;
		DBUG_ENTER("find_tool");
		DBUG_PRINT("enter", ("progname: %s", my_progname));
		@@ -379,36 +361,24 @@ static void find_tool(char tool_path, const char tool_name)
		if (init_dynamic_string(&ds_tmp, "", 32, 32))
		die("Out of memory");

		/* Initialize path with the full path to this program */
		if (get_full_path_to_executable(path))
		last_fn_libchar= strrchr(self_name, FN_LIBCHAR);

		if (last_fn_libchar == NULL)
		{
		/*
		Easy way to get full executable path failed, try
		other methods
		mysql_upgrade was found by the shell searching the path. A sibling
		next to us should be found the same way.
		*/
		if (my_progname[0] == FN_LIBCHAR)
		{
		/* 1. my_progname contains full path */
		strmake(path, my_progname, FN_REFLEN);
		}
		else if (my_progname[0] == '.')
		{
		/* 2. my_progname contains relative path, prepend wd */
		char buf[FN_REFLEN];
		my_getwd(buf, FN_REFLEN, MYF(0));
		my_snprintf(path, FN_REFLEN, "%s%s", buf, my_progname);
		strncpy(tool_executable_name, tool_name, FN_REFLEN);
		}
		else
		{
		/* 3. Just go for it and hope tool is in path */
		path[0]= 0;
		}
		}
		int len;

		DBUG_PRINT("info", ("path: '%s'", path));

		/* Chop off binary name (i.e mysql-upgrade) from path */
		dirname_part(path, path, &path_len);
		/*
		mysql_upgrade was run absolutely or relatively. We can find a sibling
		by replacing our name after the LIBCHAR with the new tool name.
		*/

		/*
		When running in a not yet installed build and using libtool,
		@@ -418,38 +388,32 @@ static void find_tool(char tool_path, const char tool_name)
		mysqlcheck). Thus if path ends in .libs/, step up one directory
		and execute the tools from there
		*/
		path[max(path_len-1, 0)]= 0; /* Chop off last / */
		if (strncmp(path + dirname_length(path), ".libs", 5) == 0)
		if (((last_fn_libchar - 6) >= self_name) &&
		(strncmp(last_fn_libchar - 5, ".libs", 5) == 0) &&
		(*(last_fn_libchar - 6) == FN_LIBCHAR))
		{
		DBUG_PRINT("info", ("Chopping off .libs from '%s'", path));

		/* Chop off .libs */
		dirname_part(path, path, &path_len);
		DBUG_PRINT("info", ("Chopping off \".libs\" from end of path"));
		last_fn_libchar -= 6;
		}

		len= last_fn_libchar - self_name;

		DBUG_PRINT("info", ("path: '%s'", path));

		/* Format name of the tool to search for */
		fn_format(tool_path, tool_name,
		path, "", MYF(MY_REPLACE_DIR));

		verbose("Looking for '%s' in: %s", tool_name, tool_path);
		my_snprintf(tool_executable_name, FN_REFLEN, "%.*s%c%s",
		len, self_name, FN_LIBCHAR, tool_name);
		}

		/* Make sure the tool exists */
		if (my_access(tool_path, F_OK) != 0)
		die("Can't find '%s'", tool_path);
		verbose("Looking for '%s' as: %s", tool_name, tool_executable_name);

		/*
		Make sure it can be executed
		*/
		if (run_tool(tool_path,
		if (run_tool(tool_executable_name,
		&ds_tmp, /* Get output from command, discard*/
		"--help",
		"2>&1",
		IF_WIN("> NUL", "> /dev/null"),
		NULL))
		die("Can't execute '%s'", tool_path);
		die("Can't execute '%s'", tool_executable_name);

		dynstr_free(&ds_tmp);

		@@ -759,11 +723,20 @@ static const char *load_default_groups[]=

		int main(int argc, char **argv)
		{
		char self_name[FN_REFLEN];

		MY_INIT(argv[0]);
		#ifdef __NETWARE__
		setscreenmode(SCR_AUTOCLOSE_ON_EXIT);
		#endif

		#if __WIN__
		if (GetModuleFileName(NULL, self_name, FN_REFLEN) == 0)
		#endif
		{
		strncpy(self_name, argv[0], FN_REFLEN);
		}

		if (init_dynamic_string(&ds_args, "", 512, 256))
		die("Out of memory");

		@@ -789,10 +762,10 @@ int main(int argc, char **argv)
		dynstr_append(&ds_args, " ");

		/* Find mysql */
		find_tool(mysql_path, IF_WIN("mysql.exe", "mysql"));
		find_tool(mysql_path, IF_WIN("mysql.exe", "mysql"), self_name);

		/* Find mysqlcheck */
		find_tool(mysqlcheck_path, IF_WIN("mysqlcheck.exe", "mysqlcheck"));
		find_tool(mysqlcheck_path, IF_WIN("mysqlcheck.exe", "mysqlcheck"), self_name);

		/*
		Read the mysql_upgrade_info file to check if mysql_upgrade

include/my_sys.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -246,7 +246,7 @@ extern int NEAR my_umask, /* Default creation mask */
		NEAR my_safe_to_handle_signal, /* Set when allowed to SIGTSTP */
		NEAR my_dont_interrupt; /* call remember_intr when set */
		extern my_bool NEAR mysys_uses_curses, my_use_symdir;
		extern ulong sf_malloc_cur_memory, sf_malloc_max_memory;
		extern size_t sf_malloc_cur_memory, sf_malloc_max_memory;

		extern ulong my_default_record_cache_size;
		extern my_bool NEAR my_disable_locking,NEAR my_disable_async_io,
		@@ -577,6 +577,7 @@ extern int my_close(File Filedes,myf MyFlags);
		extern File my_dup(File file, myf MyFlags);
		extern int my_mkdir(const char *dir, int Flags, myf MyFlags);
		extern int my_readlink(char to, const char filename, myf MyFlags);
		extern int my_is_symlink(const char *filename);
		extern int my_realpath(char to, const char filename, myf MyFlags);
		extern File my_create_with_symlink(const char linkname, const char filename,
		int createflags, int access_flags,