Commit 227f223d 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


include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents 94f36589 83f48596

VC++Files/winmysqladmin/main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1196,7 +1196,7 @@ bool __fastcall TForm1::Shutd() 
  if (IsConnect)

   {

     mysql_kill(MySQL,mysql_thread_id(MySQL));

     mysql_shutdown(MySQL);

     mysql_shutdown(MySQL, SHUTDOWN_DEFAULT);

     StatusLine->SimpleText = "";



   }

VC++Files/winmysqladmin/mysql.h

+3 −1
Original line number Diff line number Diff line
@@ -229,7 +229,9 @@ int STDCALL mysql_real_query(MYSQL *mysql, const char *q, 
					unsigned int length);

int		STDCALL mysql_create_db(MYSQL *mysql, const char *DB);

int		STDCALL mysql_drop_db(MYSQL *mysql, const char *DB);

int		STDCALL mysql_shutdown(MYSQL *mysql);

int		STDCALL mysql_shutdown(MYSQL *mysql,

                                       enum enum_shutdown_level

                                       shutdown_level);

int		STDCALL mysql_dump_debug_info(MYSQL *mysql);

int		STDCALL mysql_refresh(MYSQL *mysql,

				     unsigned int refresh_options);

VC++Files/winmysqladmin/mysql_com.h

+21 −0
Original line number Diff line number Diff line
@@ -155,6 +155,27 @@ enum enum_field_types { FIELD_TYPE_DECIMAL, FIELD_TYPE_TINY, 
#define FIELD_TYPE_CHAR FIELD_TYPE_TINY		/* For compability */

#define FIELD_TYPE_INTERVAL FIELD_TYPE_ENUM	/* For compability */



enum enum_shutdown_level {

  /*

    We want levels to be in growing order of gracefulness. So we leave room

    for future intermediate levels. For now, escalating one level is += 10;

    later if we insert new levels in between we will need a function

    next_shutdown_level(level). Note that DEFAULT does not respect the

    growing property.

  */

  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

    server does not support this shutdown level yet".

  */

  SHUTDOWN_WAIT_CRITICAL_BUFFERS= 10, /* flush MyISAM buffs (no corruption) */

  SHUTDOWN_WAIT_ALL_BUFFERS= 20, /* flush InnoDB buffers */

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

};



extern unsigned long max_allowed_packet;

extern unsigned long net_buffer_length;

client/mysqladmin.c

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) 
	  !stat(pidfile, &pidfile_status))

	last_modified= pidfile_status.st_mtime;



      if (mysql_shutdown(mysql))

      if (mysql_shutdown(mysql, SHUTDOWN_DEFAULT))

      {

	my_printf_error(0,"shutdown failed; error: '%s'",MYF(ME_BELL),

			mysql_error(mysql));

include/mysql.h

+3 −1
Original line number Diff line number Diff line
@@ -453,7 +453,9 @@ int STDCALL mysql_add_slave(MYSQL* mysql, const char* host, 
					const char* user,

					const char* passwd);



int		STDCALL mysql_shutdown(MYSQL *mysql);

int		STDCALL mysql_shutdown(MYSQL *mysql,

                                       enum enum_shutdown_level

                                       shutdown_level);

int		STDCALL mysql_dump_debug_info(MYSQL *mysql);

int		STDCALL mysql_refresh(MYSQL *mysql,

				     unsigned int refresh_options);