Commit d4590fa8 authored by unknown's avatar unknown
Browse files

Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 

into mysql.com:/home/mysql_src/mysql-4.1-874
parents cc6d65b8 32ad5879

VC++Files/winmysqladmin/mysql_com.h

+9 −9
Original line number Diff line number Diff line
@@ -159,10 +159,10 @@ enum enum_field_types { FIELD_TYPE_DECIMAL, FIELD_TYPE_TINY, 
/* Shutdown/kill enums and constants */ 



/* Bits for THD::killable. */

#define KILLABLE_CONNECT    (unsigned char)(1 << 0)

#define KILLABLE_TRANS      (unsigned char)(1 << 1)

#define KILLABLE_LOCK_TABLE (unsigned char)(1 << 2)

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

#define MYSQL_SHUTDOWN_KILLABLE_CONNECT    (unsigned char)(1 << 0)

#define MYSQL_SHUTDOWN_KILLABLE_TRANS      (unsigned char)(1 << 1)

#define MYSQL_SHUTDOWN_KILLABLE_LOCK_TABLE (unsigned char)(1 << 2)

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



enum enum_shutdown_level {

  /*
@@ -172,15 +172,15 @@ enum enum_shutdown_level { 
  */

  SHUTDOWN_DEFAULT= 0,

  /* wait for existing connections to finish */

  SHUTDOWN_WAIT_CONNECTIONS= KILLABLE_CONNECT,

  SHUTDOWN_WAIT_CONNECTIONS= MYSQL_SHUTDOWN_KILLABLE_CONNECT,

  /* wait for existing trans to finish */

  SHUTDOWN_WAIT_TRANSACTIONS= KILLABLE_TRANS,

  SHUTDOWN_WAIT_TRANSACTIONS= MYSQL_SHUTDOWN_KILLABLE_TRANS,

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

  SHUTDOWN_WAIT_UPDATES= KILLABLE_UPDATE,

  SHUTDOWN_WAIT_UPDATES= MYSQL_SHUTDOWN_KILLABLE_UPDATE,

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

  SHUTDOWN_WAIT_ALL_BUFFERS= (KILLABLE_UPDATE << 1),

  SHUTDOWN_WAIT_ALL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1),

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

  SHUTDOWN_WAIT_CRITICAL_BUFFERS= (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,

include/mysql_com.h

+9 −9
Original line number Diff line number Diff line
@@ -227,10 +227,10 @@ enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY, 
/* Shutdown/kill enums and constants */ 



/* Bits for THD::killable. */

#define KILLABLE_CONNECT    (unsigned char)(1 << 0)

#define KILLABLE_TRANS      (unsigned char)(1 << 1)

#define KILLABLE_LOCK_TABLE (unsigned char)(1 << 2)

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

#define MYSQL_SHUTDOWN_KILLABLE_CONNECT    (unsigned char)(1 << 0)

#define MYSQL_SHUTDOWN_KILLABLE_TRANS      (unsigned char)(1 << 1)

#define MYSQL_SHUTDOWN_KILLABLE_LOCK_TABLE (unsigned char)(1 << 2)

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



enum enum_shutdown_level {

  /*
@@ -240,15 +240,15 @@ enum enum_shutdown_level { 
  */

  SHUTDOWN_DEFAULT= 0,

  /* wait for existing connections to finish */

  SHUTDOWN_WAIT_CONNECTIONS= KILLABLE_CONNECT,

  SHUTDOWN_WAIT_CONNECTIONS= MYSQL_SHUTDOWN_KILLABLE_CONNECT,

  /* wait for existing trans to finish */

  SHUTDOWN_WAIT_TRANSACTIONS= KILLABLE_TRANS,

  SHUTDOWN_WAIT_TRANSACTIONS= MYSQL_SHUTDOWN_KILLABLE_TRANS,

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

  SHUTDOWN_WAIT_UPDATES= KILLABLE_UPDATE,

  SHUTDOWN_WAIT_UPDATES= MYSQL_SHUTDOWN_KILLABLE_UPDATE,

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

  SHUTDOWN_WAIT_ALL_BUFFERS= (KILLABLE_UPDATE << 1),

  SHUTDOWN_WAIT_ALL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1),

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

  SHUTDOWN_WAIT_CRITICAL_BUFFERS= (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,