diff options
author | unknown <guilhem@mysql.com> | 2004-06-15 11:35:23 +0200 |
---|---|---|
committer | unknown <guilhem@mysql.com> | 2004-06-15 11:35:23 +0200 |
commit | 766eef4c09a9e6b9c0d12256a756f25dc297dec8 (patch) | |
tree | 5975f12541afcd6e853432cf20d0f88672d428f7 /tools | |
parent | 01379a249d5f10a9a99d735406c8649f36690f9b (diff) | |
download | mariadb-git-766eef4c09a9e6b9c0d12256a756f25dc297dec8.tar.gz |
API change: mysql_shutdown() now needs a 2nd parameter, the shutdown level.
Server will however still accept shutdown without specified level; so that old
mysqladmin can still shut server down.
I would like your comments on the names of shutdown level which I chose. You
are welcome to propose better names. Please however check WL#709 before.
Reason for the names I propose is to be accurate, thus leaving possibility
for other levels which we may imagine in the future; that's why I have rejected
names like "fast", "smart", "graceful" so far. My position is that WAIT_ALL_BUFFERS
or WAIT_CRITICAL_BUFFERS say what the shutdown does, whereas for "smart", "fast" you
need to remember what it does.
This should be pushed in 4.1.3 but only after your comments.
client/mysqladmin.c:
2nd parameter for mysql_shutdown()
include/mysql.h:
2nd paramater for mysql_shutdown()
include/mysql_com.h:
4 types of shutdown
libmysql/libmysql.c:
passing the requested shutdown level
sql/sql_parse.cc:
check for the shutdown level in dispatch_command(). Though its value is ignored for now.
tools/mysqlmanager.c:
2nd parameter to mysql_shutdown
Diffstat (limited to 'tools')
-rw-r--r-- | tools/mysqlmanager.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/mysqlmanager.c b/tools/mysqlmanager.c index 45865e97ab7..bb0a76d6c49 100644 --- a/tools/mysqlmanager.c +++ b/tools/mysqlmanager.c @@ -687,7 +687,7 @@ HANDLE_DECL(handle_stop_exec) error="Process not running"; goto err; } - if (mysql_shutdown(&e->mysql)) + if (mysql_shutdown(&e->mysql, SHUTDOWN_DEFAULT)) { /* e->th=0; */ /* th may be a struct */ pthread_mutex_unlock(&e->lock); |