summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/mysql_com.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h
index 90859b467c6..d7d0133a093 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -225,7 +225,7 @@ enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY,
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;
later if we insert new levels in between we will need a function
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
server does not support this shutdown level yet".
*/
- SHUTDOWN_WAIT_CRITICAL_BUFFERS= 10, /* flush MyISAM buffs (no corruption) */
- SHUTDOWN_WAIT_ALL_BUFFERS= 20, /* flush InnoDB buffers */
+ SHUTDOWN_WAIT_CONNECTIONS= 10, /* wait for existing connections to finish */
+ SHUTDOWN_WAIT_TRANSACTIONS= 20, /* wait for existing trans 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_CONNECTIONS= 50 /* wait for existing connections to finish */
+ SHUTDOWN_WAIT_ALL_BUFFERS= 40, /* flush InnoDB buffers */
+ SHUTDOWN_WAIT_CRITICAL_BUFFERS= 50, /* flush MyISAM buffs (no corruption) */
+ SHUTDOWN_ENUM_END= 255 /* must be last */
};
/* options for mysql_set_option */