database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

changing order of enum_shutdown_level (easier; we can test if we should die with

Browse Source 
"if (thd->killed > thd->killable)", if we simply do
thd->killed= level;
This commit is contained in:
unknown
2004-06-21 16:36:28 +02:00
parent 5777892b66
commit 7ef30b6984
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
VC++Files/winmysqladmin/mysql_com.h
View File

@ -157,7 +157,7 @@ enum enum_field_types { FIELD_TYPE_DECIMAL, FIELD_TYPE_TINY,
enum enum_shutdown_level { enum enum_shutdown_level {
/* /*
We want levels to be in growing order of gracefulness. So we leave room We want levels to be in growing order of hardness. So we leave room
for future intermediate levels. For now, escalating one level is += 10; for future intermediate levels. For now, escalating one level is += 10;
later if we insert new levels in between we will need a function later if we insert new levels in between we will need a function
next_shutdown_level(level). Note that DEFAULT does not respect the next_shutdown_level(level). Note that DEFAULT does not respect the
@ -169,11 +169,12 @@ enum enum_shutdown_level {
something). WAIT_ALL_BUFFERS is what we have now. Others are "this MySQL something). WAIT_ALL_BUFFERS is what we have now. Others are "this MySQL
server does not support this shutdown level yet". server does not support this shutdown level yet".
*/ */
SHUTDOWN_WAIT_CRITICAL_BUFFERS= 10, /* flush MyISAM buffs (no corruption) */ SHUTDOWN_WAIT_CONNECTIONS= 10, /* wait for existing connections to finish */
SHUTDOWN_WAIT_ALL_BUFFERS= 20, /* flush InnoDB buffers */ SHUTDOWN_WAIT_TRANSACTIONS= 20, /* wait for existing trans to finish */
SHUTDOWN_WAIT_STATEMENTS= 30, /* wait for existing updating stmts to finish */ SHUTDOWN_WAIT_STATEMENTS= 30, /* wait for existing updating stmts to finish */
SHUTDOWN_WAIT_TRANSACTIONS= 40, /* wait for existing trans to finish */ SHUTDOWN_WAIT_ALL_BUFFERS= 40, /* flush InnoDB buffers */
SHUTDOWN_WAIT_CONNECTIONS= 50 /* wait for existing connections to finish */ SHUTDOWN_WAIT_CRITICAL_BUFFERS= 50, /* flush MyISAM buffs (no corruption) */
SHUTDOWN_ENUM_END= 255 /* must be last */
}; };
extern unsigned long max_allowed_packet; extern unsigned long max_allowed_packet;

11
include/mysql_com.h
View File

@ -225,7 +225,7 @@ enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY,
enum enum_shutdown_level { enum enum_shutdown_level {
/* /*
We want levels to be in growing order of gracefulness. So we leave room We want levels to be in growing order of hardness. So we leave room
for future intermediate levels. For now, escalating one level is += 10; for future intermediate levels. For now, escalating one level is += 10;
later if we insert new levels in between we will need a function later if we insert new levels in between we will need a function
next_shutdown_level(level). Note that DEFAULT does not respect the next_shutdown_level(level). Note that DEFAULT does not respect the
@ -237,11 +237,12 @@ enum enum_shutdown_level {
something). WAIT_ALL_BUFFERS is what we have now. Others are "this MySQL something). WAIT_ALL_BUFFERS is what we have now. Others are "this MySQL
server does not support this shutdown level yet". server does not support this shutdown level yet".
*/ */
SHUTDOWN_WAIT_CRITICAL_BUFFERS= 10, /* flush MyISAM buffs (no corruption) */ SHUTDOWN_WAIT_CONNECTIONS= 10, /* wait for existing connections to finish */
SHUTDOWN_WAIT_ALL_BUFFERS= 20, /* flush InnoDB buffers */ SHUTDOWN_WAIT_TRANSACTIONS= 20, /* wait for existing trans to finish */
SHUTDOWN_WAIT_STATEMENTS= 30, /* wait for existing updating stmts to finish */ SHUTDOWN_WAIT_STATEMENTS= 30, /* wait for existing updating stmts to finish */
SHUTDOWN_WAIT_TRANSACTIONS= 40, /* wait for existing trans to finish */ SHUTDOWN_WAIT_ALL_BUFFERS= 40, /* flush InnoDB buffers */
SHUTDOWN_WAIT_CONNECTIONS= 50 /* wait for existing connections to finish */ SHUTDOWN_WAIT_CRITICAL_BUFFERS= 50, /* flush MyISAM buffs (no corruption) */
SHUTDOWN_ENUM_END= 255 /* must be last */
}; };
/* options for mysql_set_option */ /* options for mysql_set_option */