summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorguilhem@mysql.com <>2004-06-15 11:35:23 +0200
committerguilhem@mysql.com <>2004-06-15 11:35:23 +0200
commitf1fda6387e5e0169a2d654928c5d592b6abea4f8 (patch)
tree5975f12541afcd6e853432cf20d0f88672d428f7 /client
parent5dd2881f542e06a4ba236d15c19d0da5a8799c71 (diff)
downloadmariadb-git-f1fda6387e5e0169a2d654928c5d592b6abea4f8.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.
Diffstat (limited to 'client')
-rw-r--r--client/mysqladmin.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqladmin.c b/client/mysqladmin.c
index fcbcc0d7151..aaed101a83e 100644
--- a/client/mysqladmin.c
+++ b/client/mysqladmin.c
@@ -509,7 +509,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
!stat(pidfile, &pidfile_status))
last_modified= pidfile_status.st_mtime;
- if (mysql_shutdown(mysql))
+ if (mysql_shutdown(mysql, SHUTDOWN_DEFAULT))
{
my_printf_error(0,"shutdown failed; error: '%s'",MYF(ME_BELL),
mysql_error(mysql));