Commit e3c56fd4 authored by unknown's avatar unknown
Browse files

mysql_com.h: 

  still better names for enum; removing unneeded symbol


include/mysql_com.h:
  still better names for enum; removing unneeded symbol
VC++Files/winmysqladmin/mysql_com.h:
  still better names for enum; removing unneeded symbol
parent d4590fa8

VC++Files/winmysqladmin/mysql_com.h

+7 −11
Original line number Diff line number Diff line
@@ -164,23 +164,23 @@ enum enum_field_types { FIELD_TYPE_DECIMAL, FIELD_TYPE_TINY, 
#define MYSQL_SHUTDOWN_KILLABLE_LOCK_TABLE (unsigned char)(1 << 2)

#define MYSQL_SHUTDOWN_KILLABLE_UPDATE     (unsigned char)(1 << 3)



enum enum_shutdown_level {

enum mysql_enum_shutdown_level {

  /*

    We want levels to be in growing order of hardness (because we use number

    comparisons). Note that DEFAULT does not respect the growing property, but

    it's ok.

  */

  SHUTDOWN_DEFAULT= 0,

  DEFAULT= 0,

  /* wait for existing connections to finish */

  SHUTDOWN_WAIT_CONNECTIONS= MYSQL_SHUTDOWN_KILLABLE_CONNECT,

  WAIT_CONNECTIONS= MYSQL_SHUTDOWN_KILLABLE_CONNECT,

  /* wait for existing trans to finish */

  SHUTDOWN_WAIT_TRANSACTIONS= MYSQL_SHUTDOWN_KILLABLE_TRANS,

  WAIT_TRANSACTIONS= MYSQL_SHUTDOWN_KILLABLE_TRANS,

  /* wait for existing updates to finish (=> no partial MyISAM update) */

  SHUTDOWN_WAIT_UPDATES= MYSQL_SHUTDOWN_KILLABLE_UPDATE,

  WAIT_UPDATES= MYSQL_SHUTDOWN_KILLABLE_UPDATE,

  /* flush InnoDB buffers and other storage engines' buffers*/

  SHUTDOWN_WAIT_ALL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1),

  WAIT_ALL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1),

  /* don't flush InnoDB buffers, flush other storage engines' buffers*/

  SHUTDOWN_WAIT_CRITICAL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1) + 1,

  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,
@@ -188,10 +188,6 @@ enum enum_shutdown_level { 
  KILL_CONNECTION= 255

};



/* Same value and type (0, enum_shutdown_level) but not same meaning */

#define NOT_KILLED SHUTDOWN_DEFAULT





extern unsigned long max_allowed_packet;

extern unsigned long net_buffer_length;

include/mysql_com.h

+7 −11
Original line number Diff line number Diff line
@@ -232,23 +232,23 @@ enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY, 
#define MYSQL_SHUTDOWN_KILLABLE_LOCK_TABLE (unsigned char)(1 << 2)

#define MYSQL_SHUTDOWN_KILLABLE_UPDATE     (unsigned char)(1 << 3)



enum enum_shutdown_level {

enum mysql_enum_shutdown_level {

  /*

    We want levels to be in growing order of hardness (because we use number

    comparisons). Note that DEFAULT does not respect the growing property, but

    it's ok.

  */

  SHUTDOWN_DEFAULT= 0,

  DEFAULT= 0,

  /* wait for existing connections to finish */

  SHUTDOWN_WAIT_CONNECTIONS= MYSQL_SHUTDOWN_KILLABLE_CONNECT,

  WAIT_CONNECTIONS= MYSQL_SHUTDOWN_KILLABLE_CONNECT,

  /* wait for existing trans to finish */

  SHUTDOWN_WAIT_TRANSACTIONS= MYSQL_SHUTDOWN_KILLABLE_TRANS,

  WAIT_TRANSACTIONS= MYSQL_SHUTDOWN_KILLABLE_TRANS,

  /* wait for existing updates to finish (=> no partial MyISAM update) */

  SHUTDOWN_WAIT_UPDATES= MYSQL_SHUTDOWN_KILLABLE_UPDATE,

  WAIT_UPDATES= MYSQL_SHUTDOWN_KILLABLE_UPDATE,

  /* flush InnoDB buffers and other storage engines' buffers*/

  SHUTDOWN_WAIT_ALL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1),

  WAIT_ALL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1),

  /* don't flush InnoDB buffers, flush other storage engines' buffers*/

  SHUTDOWN_WAIT_CRITICAL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1) + 1,

  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,
@@ -256,10 +256,6 @@ enum enum_shutdown_level { 
  KILL_CONNECTION= 255

};



/* Same value and type (0, enum_shutdown_level) but not same meaning */

#define NOT_KILLED SHUTDOWN_DEFAULT





/* options for mysql_set_option */

enum enum_mysql_set_option

{