mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 09:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed symbol name problems that made build fail.

Browse source
This commit is contained in:
pem@mysql.comhem.se 2004-08-19 20:48:00 +02:00
parent 22a65bcf26
commit 2d7f4c30a7
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mysql.h
View file

@ -454,7 +454,7 @@ int STDCALL mysql_add_slave(MYSQL* mysql, const char* host,
const char* passwd); const char* passwd);
int STDCALL mysql_shutdown(MYSQL *mysql, int STDCALL mysql_shutdown(MYSQL *mysql,
enum enum_shutdown_level enum mysql_enum_shutdown_level
shutdown_level); shutdown_level);
int STDCALL mysql_dump_debug_info(MYSQL *mysql); int STDCALL mysql_dump_debug_info(MYSQL *mysql);
int STDCALL mysql_refresh(MYSQL *mysql, int STDCALL mysql_refresh(MYSQL *mysql,

12
include/mysql_com.h
View file

@ -238,17 +238,17 @@ enum mysql_enum_shutdown_level {
comparisons). Note that DEFAULT does not respect the growing property, but comparisons). Note that DEFAULT does not respect the growing property, but
it's ok. it's ok.
*/ */
DEFAULT= 0, SHUTDOWN_DEFAULT = 0,
/* wait for existing connections to finish */ /* wait for existing connections to finish */
WAIT_CONNECTIONS= MYSQL_SHUTDOWN_KILLABLE_CONNECT, SHUTDOWN_WAIT_CONNECTIONS= MYSQL_SHUTDOWN_KILLABLE_CONNECT,
/* wait for existing trans to finish */ /* wait for existing trans to finish */
WAIT_TRANSACTIONS= MYSQL_SHUTDOWN_KILLABLE_TRANS, SHUTDOWN_WAIT_TRANSACTIONS= MYSQL_SHUTDOWN_KILLABLE_TRANS,
/* wait for existing updates to finish (=> no partial MyISAM update) */ /* wait for existing updates to finish (=> no partial MyISAM update) */
WAIT_UPDATES= MYSQL_SHUTDOWN_KILLABLE_UPDATE, SHUTDOWN_WAIT_UPDATES= MYSQL_SHUTDOWN_KILLABLE_UPDATE,
/* flush InnoDB buffers and other storage engines' buffers*/ /* flush InnoDB buffers and other storage engines' buffers*/
WAIT_ALL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1), SHUTDOWN_WAIT_ALL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1),
/* don't flush InnoDB buffers, flush other storage engines' buffers*/ /* don't flush InnoDB buffers, flush other storage engines' buffers*/
WAIT_CRITICAL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1) + 1, SHUTDOWN_WAIT_CRITICAL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1) + 1,
/* Now the 2 levels of the KILL command */ /* Now the 2 levels of the KILL command */
#if MYSQL_VERSION_ID >= 50000 #if MYSQL_VERSION_ID >= 50000
KILL_QUERY= 254, KILL_QUERY= 254,

2
libmysql/libmysql.c
View file

@ -1291,7 +1291,7 @@ mysql_drop_db(MYSQL *mysql, const char *db)
int STDCALL int STDCALL
mysql_shutdown(MYSQL *mysql, enum enum_shutdown_level shutdown_level) mysql_shutdown(MYSQL *mysql, enum mysql_enum_shutdown_level shutdown_level)
{ {
uchar level[1]; uchar level[1];
DBUG_ENTER("mysql_shutdown"); DBUG_ENTER("mysql_shutdown");

4
sql/sql_parse.cc
View file

@ -1643,8 +1643,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
SHUTDOWN_DEFAULT is 0. If client is >= 4.1.3, the shutdown level is in SHUTDOWN_DEFAULT is 0. If client is >= 4.1.3, the shutdown level is in
packet[0]. packet[0].
*/ */
enum enum_shutdown_level level= enum mysql_enum_shutdown_level level=
(enum enum_shutdown_level) (uchar) packet[0]; (enum mysql_enum_shutdown_level) (uchar) packet[0];
DBUG_PRINT("quit",("Got shutdown command for level %u", level)); DBUG_PRINT("quit",("Got shutdown command for level %u", level));
if (level == SHUTDOWN_DEFAULT) if (level == SHUTDOWN_DEFAULT)
level= SHUTDOWN_WAIT_ALL_BUFFERS; // soon default will be configurable level= SHUTDOWN_WAIT_ALL_BUFFERS; // soon default will be configurable