Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj (bc4df94e) · Commits · Software / OSDI20 Artifacts / mariadb

CMakeLists.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,10 @@ ADD_DEFINITIONS(-D WITH_MYISAM_STORAGE_ENGINE)
		ADD_DEFINITIONS(-D CMAKE_BUILD)
		ADD_DEFINITIONS(-D HAVE_YASSL)

		# Set debug options
		SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DFORCE_INIT_OF_VARS")
		SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DFORCE_INIT_OF_VARS")

		SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_myisam_plugin")


		@@ -116,6 +120,9 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
		STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG
		${CMAKE_CXX_FLAGS_DEBUG})

		# generate map files
		SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MAP /MAPINFO:EXPORTS")

		# remove support for Exception handling
		STRING(REPLACE "/GX" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
		STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})

client/mysqldump.c

+10 −3

Original line number	Diff line number	Diff line
		@@ -1489,8 +1489,15 @@ static uint dump_routines_for_db(char *db)
		routine body of other routines that are not the creator of!
		*/
		DBUG_PRINT("info",("length of body for %s row[2] '%s' is %d",
		routine_name, row[2], (int) strlen(row[2])));
		if (strlen(row[2]))
		routine_name, row[2] ? row[2] : "(null)",
		row[2] ? (int) strlen(row[2]) : 0));
		if (row[2] == NULL)
		{
		fprintf(sql_file, "\n-- insufficient privileges to %s\n", query_buff);
		fprintf(sql_file, "-- does %s have permissions on mysql.proc?\n\n", current_user);
		maybe_die(EX_MYSQLERR,"%s has insufficent privileges to %s!", current_user, query_buff);
		}
		else if (strlen(row[2]))
		{
		char *query_str= NULL;
		char *definer_begin;
		@@ -1540,7 +1547,7 @@ static uint dump_routines_for_db(char *db)
		/*
		we need to change sql_mode only for the CREATE
		PROCEDURE/FUNCTION otherwise we may need to re-quote routine_name
		*/;
		*/
		fprintf(sql_file, "/!50003 SET SESSION SQL_MODE=\"%s\"/;;\n",
		row[1] /* sql_mode */);
		fprintf(sql_file, "/!50003 %s /;;\n",

extra/my_print_defaults.c

+18 −5

Original line number	Diff line number	Diff line
		@@ -33,7 +33,20 @@ const char *default_dbug_option="d:t:o,/tmp/my_print_defaults.trace";

		static struct my_option my_long_options[] =
		{
		{"config-file", 'c', "The config file to be used.",
		/*
		NB: --config-file is troublesome, because get_defaults_options() doesn't
		know about it, but we pretend --config-file is like --defaults-file. In
		fact they behave differently: see the comments at the top of
		mysys/default.c for how --defaults-file should behave.

		This --config-file option behaves as:
		- If it has a directory name part (absolute or relative), then only this
		file is read; no error is given if the file doesn't exist
		- If the file has no directory name part, the standard locations are
		searched for a file of this name (and standard filename extensions are
		added if the file has no extension)
		*/
		{"config-file", 'c', "Deprecated, please use --defaults-file instead. Name of config file to read; if no extension is given, default extension (e.g., .ini or .cnf) will be added",
		(gptr) &config_file, (gptr) &config_file, 0, GET_STR, REQUIRED_ARG,
		0, 0, 0, 0, 0, 0},
		#ifdef DBUG_OFF
		@@ -43,11 +56,11 @@ static struct my_option my_long_options[] =
		{"debug", '#', "Output debug log", (gptr*) &default_dbug_option,
		(gptr*) &default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
		#endif
		{"defaults-file", 'c', "Synonym for --config-file.",
		{"defaults-file", 'c', "Like --config-file, except: if first option, then read this file only, do not read global or per-user config files; should be the first option",
		(gptr) &config_file, (gptr) &config_file, 0, GET_STR, REQUIRED_ARG,
		0, 0, 0, 0, 0, 0},
		{"defaults-extra-file", 'e',
		"Read this file after the global /etc config file and before the config file in the users home directory.",
		"Read this file after the global config file and before the config file in the users home directory; should be the first option",
		(gptr) &my_defaults_extra_file, (gptr) &my_defaults_extra_file, 0,
		GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
		{"defaults-group-suffix", 'g',
		@@ -55,7 +68,7 @@ static struct my_option my_long_options[] =
		(gptr) &my_defaults_group_suffix, (gptr) &my_defaults_group_suffix,
		0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
		{"extra-file", 'e',
		"Synonym for --defaults-extra-file.",
		"Deprecated. Synonym for --defaults-extra-file.",
		(gptr*) &my_defaults_extra_file,
		(gptr*) &my_defaults_extra_file, 0, GET_STR,
		REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
		@@ -86,7 +99,7 @@ static void usage(my_bool version)
		my_print_help(my_long_options);
		my_print_default_files(config_file);
		my_print_variables(my_long_options);
		printf("\nExample usage:\n%s --config-file=my client mysql\n", my_progname);
		printf("\nExample usage:\n%s --defaults-file=example.cnf client mysql\n", my_progname);
		}

		#include <help_end.h>

include/my_global.h

+9 −2

Original line number	Diff line number	Diff line
		@@ -784,13 +784,20 @@ typedef SOCKET_SIZE_TYPE size_socket;
		#define SSIZE_MAX ((~((size_t) 0)) / 2)
		#endif

		#ifndef HAVE_FINITE
		#define finite(x) (1.0 / fabs(x) > 0.0)
		#endif

		#ifndef HAVE_ISNAN
		#define isnan(x) ((x) != (x))
		#endif

		#if !defined(HAVE_ISINF)
		/* The configure check for "isinf with math.h" has failed */
		#ifdef isinf
		#undef isinf
		#endif
		/* Define isinf to never say that X is infinite */
		#define isinf(X) 0
		#define isinf(X) (!finite(X) && !isnan(X))
		#endif

		/* Define missing math constants. */

mysql-test/include/have_lowercase1.inc

0 → 100644

+4 −0

Original line number	Diff line number	Diff line
		--require r/lowercase1.require
		--disable_query_log
		show variables like 'lower_case_table_names';
		--enable_query_log