Commit 0ed563e8 authored by unknown's avatar unknown
Browse files

Fixed symbol name problems that made build fail. 


include/mysql.h:
  Fixed symbol name change.
include/mysql_com.h:
  Reverted parts of previous changeset (name changes) to make it build.
libmysql/libmysql.c:
  Fixed symbol name change.
sql/sql_parse.cc:
  Fixed symbol name change.
parent e3c56fd4

include/mysql.h

+1 −1
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ int STDCALL mysql_add_slave(MYSQL* mysql, const char* host, 
					const char* passwd);



int		STDCALL mysql_shutdown(MYSQL *mysql,

                                       enum enum_shutdown_level

                                       enum mysql_enum_shutdown_level

                                       shutdown_level);

int		STDCALL mysql_dump_debug_info(MYSQL *mysql);

int		STDCALL mysql_refresh(MYSQL *mysql,

include/mysql_com.h

+6 −6
Original line number Diff line number Diff line
@@ -238,17 +238,17 @@ enum mysql_enum_shutdown_level { 
    comparisons). Note that DEFAULT does not respect the growing property, but

    it's ok.

  */

  DEFAULT= 0,

  SHUTDOWN_DEFAULT = 0,

  /* 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_TRANSACTIONS= MYSQL_SHUTDOWN_KILLABLE_TRANS,

  SHUTDOWN_WAIT_TRANSACTIONS= MYSQL_SHUTDOWN_KILLABLE_TRANS,

  /* 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*/

  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*/

  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 */

#if MYSQL_VERSION_ID >= 50000

  KILL_QUERY= 254,

libmysql/libmysql.c

+1 −1
Original line number Diff line number Diff line
@@ -1291,7 +1291,7 @@ mysql_drop_db(MYSQL *mysql, const char *db) 




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];

  DBUG_ENTER("mysql_shutdown");

sql/sql_parse.cc

+2 −2
Original line number Diff line number Diff line
@@ -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

      packet[0].

    */

    enum enum_shutdown_level level=

      (enum enum_shutdown_level) (uchar) packet[0];

    enum mysql_enum_shutdown_level level=

      (enum mysql_enum_shutdown_level) (uchar) packet[0];

    DBUG_PRINT("quit",("Got shutdown command for level %u", level));

    if (level == SHUTDOWN_DEFAULT)

      level= SHUTDOWN_WAIT_ALL_BUFFERS; // soon default will be configurable