Merge mysql.com:/d2/hf/common/my50-common (380ad35c) · Commits · Software / OSDI20 Artifacts / mariadb

BUILD/check-cpu

+1 −2

Original line number	Diff line number	Diff line
		@@ -177,8 +177,7 @@ check_cpu () {
		touch __test.c

		while [ "$cpu_arg" ] ; do
		# FIXME: echo -n isn't portable - see contortions autoconf goes through
		echo -n testing $cpu_arg "... " >&2
		printf "testing $cpu_arg ... " >&2

		# compile check
		check_cpu_cflags=`eval echo $check_cpu_args`

VC++Files/mysys/mysys.vcproj

+43 −0

Original line number	Diff line number	Diff line
		@@ -3417,6 +3417,49 @@
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		</File>
		<File
		RelativePath="my_getpagesize.c">
		<FileConfiguration
		Name="Debug\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="0"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		<FileConfiguration
		Name="Max\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="2"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		<FileConfiguration
		Name="Release\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="2"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		<FileConfiguration
		Name="TLS_DEBUG\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="0"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		<FileConfiguration
		Name="TLS\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="2"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		</File>
		<File
		RelativePath="my_mmap.c">
		<FileConfiguration

client/mysql_upgrade.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -143,6 +143,7 @@ void set_extra_default(int id, const struct my_option *opt)
		case 'f': /* --force is ours */
		case 'u': /* --user passed on cmdline */
		case 'T': /* --debug-info is not accepted by mysqlcheck */
		case 'p': /* --password may change yet */
		/* so, do nothing */
		break;
		default:
		@@ -174,7 +175,7 @@ void set_extra_default(int id, const struct my_option *opt)
		d->id= id;
		d->name= opt->name;
		d->n_len= strlen(opt->name);
		if (opt->arg_type != NO_ARG)
		if (opt->arg_type != NO_ARG && opt->value)
		switch (opt->var_type & GET_TYPE_MASK) {
		case GET_BOOL:
		if (((int )opt->value))
		@@ -320,6 +321,15 @@ static int create_defaults_file(const char path, const char forced_path)
		}

		dynstr_set(&buf, "\n[client]");
		if (opt_password)
		{
		if (dynstr_append(&buf, "\npassword=")
		\|\| dynstr_append(&buf, opt_password))
		{
		ret = 1;
		goto error;
		}
		}
		while (extra_defaults)
		{
		int len;

configure.in

+12 −4

Original line number	Diff line number	Diff line
		@@ -1073,6 +1073,8 @@ case $SYSTEM_TYPE in
		fi
		;;
		darwin)
		AC_DEFINE([DEFAULT_SKIP_THREAD_PRIORITY], [1], [default to skip thread priority])
		CPPFLAGS="-D"
		if test "$ac_cv_prog_gcc" = "yes"
		then
		FLAGS="-D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT"
		@@ -2494,12 +2496,14 @@ thread_dirs=

		dnl This probably should be cleaned up more - for now the threaded
		dnl client is just using plain-old libs.
		sql_client_dirs="strings regex mysys libmysql client"
		sql_client_dirs=
		linked_client_targets="linked_libmysql_sources"

		if test "$THREAD_SAFE_CLIENT" != "no"
		if test "$THREAD_SAFE_CLIENT" = "no"
		then
		sql_client_dirs="libmysql_r $sql_client_dirs"
		sql_client_dirs="strings regex mysys extra libmysql client"
		else
		sql_client_dirs="strings regex mysys extra libmysql libmysql_r client"
		linked_client_targets="$linked_client_targets linked_libmysql_r_sources"
		AC_CONFIG_FILES(libmysql_r/Makefile)
		AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe])
		@@ -2528,13 +2532,17 @@ AM_CONDITIONAL(HAVE_NETWARE, test "$netware_dir" = "netware")
		export CC CXX CFLAGS CXXFLAGS LD LDFLAGS AR
		ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' CXXFLAGS='$CXXFLAGS'"

		if test "$with_server" = "yes" -o "$THREAD_SAFE_CLIENT" != "no"
		if test "$with_server" != "no" -o "$THREAD_SAFE_CLIENT" != "no"
		then
		AC_DEFINE([THREAD], [1],
		[Define if you want to have threaded code. This may be undef on client code])
		# Avoid _PROGRAMS names
		THREAD_LOBJECTS="thr_alarm.o thr_lock.o thr_mutex.o thr_rwlock.o my_pthread.o my_thr_init.o mf_keycache.o"
		AC_SUBST(THREAD_LOBJECTS)
		fi

		if test "$with_server" != "no"
		then
		server_scripts="mysqld_safe mysql_install_db"
		sql_server_dirs="strings mysys dbug extra regex"

include/my_global.h

+36 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,42 @@
		#define NETWARE_SET_SCREEN_MODE(A)
		#endif

		/*
		The macros below are used to allow build of Universal/fat binaries of
		MySQL and MySQL applications under darwin.
		*/
		#ifdef TARGET_FAT_BINARY
		# undef SIZEOF_CHARP
		# undef SIZEOF_INT
		# undef SIZEOF_LONG
		# undef SIZEOF_LONG_LONG
		# undef SIZEOF_OFF_T
		# undef SIZEOF_SHORT

		#if defined(__i386__)
		# undef WORDS_BIGENDIAN
		# define SIZEOF_CHARP 4
		# define SIZEOF_INT 4
		# define SIZEOF_LONG 4
		# define SIZEOF_LONG_LONG 8
		# define SIZEOF_OFF_T 8
		# define SIZEOF_SHORT 2

		#elif defined(__ppc__)
		# define WORDS_BIGENDIAN
		# define SIZEOF_CHARP 4
		# define SIZEOF_INT 4
		# define SIZEOF_LONG 4
		# define SIZEOF_LONG_LONG 8
		# define SIZEOF_OFF_T 8
		# define SIZEOF_SHORT 2

		#else
		# error Building FAT binary for an unknown architecture.
		#endif
		#endif /* TARGET_FAT_BINARY */


		/*
		The macros below are borrowed from include/linux/compiler.h in the
		Linux kernel. Use them to indicate the likelyhood of the truthfulness