diff options
| author | unknown <guilhem@mysql.com> | 2004-06-18 23:50:04 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-06-18 23:50:04 +0200 |
| commit | 83f485968f643cc87573d57be6944ff32b18d79a (patch) | |
| tree | 5c90f764ac83bc68c87d34eac6dafe250ad13884 /include | |
| parent | 408dad07a949a570c59e5f660d648c4df727625c (diff) | |
| download | mariadb-git-83f485968f643cc87573d57be6944ff32b18d79a.tar.gz | |
API change: mysql_shutdown() now requires a 2nd argument, the shutdown level.
mysqld >=4.1.3 will however understand shutdown requests sent by clients <4.1.3.
And mysqld <4.1.3 will understand shutdown requests sent by clients >=4.1.3
(it will ignore the level). Those shutdown level are just PLACEHOLDERS now.
So this change is just to make the 4.1 API suitable before it is frozen. Later
we will actually implement the shutdown levels.
VC++Files/winmysqladmin/main.cpp:
2nd argument to mysql_shutdown()
VC++Files/winmysqladmin/mysql.h:
2nd argument to mysql_shutdown()
VC++Files/winmysqladmin/mysql_com.h:
Several types of shutdown now.
include/mysql_com.h:
SHUTDOWN_DEFAULT is now 0 instead of 255, this saves one test in sql_parse.cc
libmysql/libmysql.c:
correcting mistake (how come that my tests still all worked with this? - should recheck, for curiosity).
sql/sql_parse.cc:
with SHUTDOWN_DEFAULT==0, no need for testing packet_length.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql_com.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index ef84ad4dea2..90859b467c6 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -231,7 +231,7 @@ enum enum_shutdown_level { next_shutdown_level(level). Note that DEFAULT does not respect the growing property. */ - SHUTDOWN_DEFAULT= 255, /* mapped to WAIT_ALL_BUFFERS for now */ + SHUTDOWN_DEFAULT= 0, /* mapped to WAIT_ALL_BUFFERS for now */ /* Here is the list in growing order (the next does the previous plus something). WAIT_ALL_BUFFERS is what we have now. Others are "this MySQL @@ -239,7 +239,7 @@ enum enum_shutdown_level { */ SHUTDOWN_WAIT_CRITICAL_BUFFERS= 10, /* flush MyISAM buffs (no corruption) */ SHUTDOWN_WAIT_ALL_BUFFERS= 20, /* flush InnoDB buffers */ - SHUTDOWN_WAIT_STATEMENTS= 30, + 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 */ }; |