Merge mskold@build.mysql.com:/home/bk/mysql-4.1 (ae79d222) · Commits · Software / OSDI20 Artifacts / mariadb

VC++Files/winmysqladmin/mysql_com.h

+11 −15

Original line number	Diff line number	Diff line
		@@ -159,28 +159,28 @@ enum enum_field_types { FIELD_TYPE_DECIMAL, FIELD_TYPE_TINY,
		/* Shutdown/kill enums and constants */

		/* Bits for THD::killable. */
		#define KILLABLE_CONNECT (unsigned char)(1 << 0)
		#define KILLABLE_TRANS (unsigned char)(1 << 1)
		#define KILLABLE_LOCK_TABLE (unsigned char)(1 << 2)
		#define KILLABLE_UPDATE (unsigned char)(1 << 3)
		#define MYSQL_SHUTDOWN_KILLABLE_CONNECT (unsigned char)(1 << 0)
		#define MYSQL_SHUTDOWN_KILLABLE_TRANS (unsigned char)(1 << 1)
		#define MYSQL_SHUTDOWN_KILLABLE_LOCK_TABLE (unsigned char)(1 << 2)
		#define MYSQL_SHUTDOWN_KILLABLE_UPDATE (unsigned char)(1 << 3)

		enum enum_shutdown_level {
		enum mysql_enum_shutdown_level {
		/*
		We want levels to be in growing order of hardness (because we use number
		comparisons). Note that DEFAULT does not respect the growing property, but
		it's ok.
		*/
		SHUTDOWN_DEFAULT= 0,
		DEFAULT= 0,
		/* wait for existing connections to finish */
		SHUTDOWN_WAIT_CONNECTIONS= KILLABLE_CONNECT,
		WAIT_CONNECTIONS= MYSQL_SHUTDOWN_KILLABLE_CONNECT,
		/* wait for existing trans to finish */
		SHUTDOWN_WAIT_TRANSACTIONS= KILLABLE_TRANS,
		WAIT_TRANSACTIONS= MYSQL_SHUTDOWN_KILLABLE_TRANS,
		/* wait for existing updates to finish (=> no partial MyISAM update) */
		SHUTDOWN_WAIT_UPDATES= KILLABLE_UPDATE,
		WAIT_UPDATES= MYSQL_SHUTDOWN_KILLABLE_UPDATE,
		/* flush InnoDB buffers and other storage engines' buffers*/
		SHUTDOWN_WAIT_ALL_BUFFERS= (KILLABLE_UPDATE << 1),
		WAIT_ALL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1),
		/* don't flush InnoDB buffers, flush other storage engines' buffers*/
		SHUTDOWN_WAIT_CRITICAL_BUFFERS= (KILLABLE_UPDATE << 1) + 1,
		WAIT_CRITICAL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1) + 1,
		/* Now the 2 levels of the KILL command */
		#if MYSQL_VERSION_ID >= 50000
		KILL_QUERY= 254,
		@@ -188,10 +188,6 @@ enum enum_shutdown_level {
		KILL_CONNECTION= 255
		};

		/* Same value and type (0, enum_shutdown_level) but not same meaning */
		#define NOT_KILLED SHUTDOWN_DEFAULT


		extern unsigned long max_allowed_packet;
		extern unsigned long net_buffer_length;

include/mysql.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -454,7 +454,7 @@ int STDCALL mysql_add_slave(MYSQL* mysql, const char* host,
		const char* passwd);

		int STDCALL mysql_shutdown(MYSQL *mysql,
		enum enum_shutdown_level
		enum mysql_enum_shutdown_level
		shutdown_level);
		int STDCALL mysql_dump_debug_info(MYSQL *mysql);
		int STDCALL mysql_refresh(MYSQL *mysql,

include/mysql_com.h

+11 −15

Original line number	Diff line number	Diff line
		@@ -227,12 +227,12 @@ enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY,
		/* Shutdown/kill enums and constants */

		/* Bits for THD::killable. */
		#define KILLABLE_CONNECT (unsigned char)(1 << 0)
		#define KILLABLE_TRANS (unsigned char)(1 << 1)
		#define KILLABLE_LOCK_TABLE (unsigned char)(1 << 2)
		#define KILLABLE_UPDATE (unsigned char)(1 << 3)
		#define MYSQL_SHUTDOWN_KILLABLE_CONNECT (unsigned char)(1 << 0)
		#define MYSQL_SHUTDOWN_KILLABLE_TRANS (unsigned char)(1 << 1)
		#define MYSQL_SHUTDOWN_KILLABLE_LOCK_TABLE (unsigned char)(1 << 2)
		#define MYSQL_SHUTDOWN_KILLABLE_UPDATE (unsigned char)(1 << 3)

		enum enum_shutdown_level {
		enum mysql_enum_shutdown_level {
		/*
		We want levels to be in growing order of hardness (because we use number
		comparisons). Note that DEFAULT does not respect the growing property, but
		@@ -240,15 +240,15 @@ enum enum_shutdown_level {
		*/
		SHUTDOWN_DEFAULT = 0,
		/* wait for existing connections to finish */
		SHUTDOWN_WAIT_CONNECTIONS= KILLABLE_CONNECT,
		SHUTDOWN_WAIT_CONNECTIONS= MYSQL_SHUTDOWN_KILLABLE_CONNECT,
		/* wait for existing trans to finish */
		SHUTDOWN_WAIT_TRANSACTIONS= KILLABLE_TRANS,
		SHUTDOWN_WAIT_TRANSACTIONS= MYSQL_SHUTDOWN_KILLABLE_TRANS,
		/* wait for existing updates to finish (=> no partial MyISAM update) */
		SHUTDOWN_WAIT_UPDATES= KILLABLE_UPDATE,
		SHUTDOWN_WAIT_UPDATES= MYSQL_SHUTDOWN_KILLABLE_UPDATE,
		/* flush InnoDB buffers and other storage engines' buffers*/
		SHUTDOWN_WAIT_ALL_BUFFERS= (KILLABLE_UPDATE << 1),
		SHUTDOWN_WAIT_ALL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1),
		/* don't flush InnoDB buffers, flush other storage engines' buffers*/
		SHUTDOWN_WAIT_CRITICAL_BUFFERS= (KILLABLE_UPDATE << 1) + 1,
		SHUTDOWN_WAIT_CRITICAL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1) + 1,
		/* Now the 2 levels of the KILL command */
		#if MYSQL_VERSION_ID >= 50000
		KILL_QUERY= 254,
		@@ -256,10 +256,6 @@ enum enum_shutdown_level {
		KILL_CONNECTION= 255
		};

		/* Same value and type (0, enum_shutdown_level) but not same meaning */
		#define NOT_KILLED SHUTDOWN_DEFAULT


		/* options for mysql_set_option */
		enum enum_mysql_set_option
		{

libmysql/libmysql.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1291,7 +1291,7 @@ mysql_drop_db(MYSQL mysql, const char db)


		int STDCALL
		mysql_shutdown(MYSQL *mysql, enum enum_shutdown_level shutdown_level)
		mysql_shutdown(MYSQL *mysql, enum mysql_enum_shutdown_level shutdown_level)
		{
		uchar level[1];
		DBUG_ENTER("mysql_shutdown");

myisam/mi_search.c

+12 −3

Original line number	Diff line number	Diff line
		@@ -396,9 +396,18 @@ int _mi_prefix_search(MI_INFO info, register MI_KEYDEF keyinfo, uchar *page,

		matched=prefix_len+left;

		if (sort_order)
		{
		for (my_flag=0;left;left--)
		if ((my_flag= (int) sort_order[vseg++] - (int) sort_order[k++]))
		break;
		}
		else
		{
		for (my_flag=0;left;left--)
		if ((my_flag= (int) vseg++ - (int) k++))
		break;
		}

		if (my_flag>0) /* mismatch */
		break;