Commit 6e1b567a authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents f72cec1b e7157aba

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");

mysql-test/r/rpl_heap.result

+6 −6
Original line number Diff line number Diff line 
reset master;

drop table if exists t1;

create table t1 (a int) type=HEAP;

insert into t1 values(10);

create table t1 type=HEAP select 10 as a;

insert into t1 values(11);

show binlog events from 79;

Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info

master-bin.001	79	Query	1	79	use `test`; create table t1 (a int) type=HEAP

master-bin.001	147	Query	1	147	use `test`; DELETE FROM `test`.`t1`

master-bin.001	205	Query	1	205	use `test`; insert into t1 values(10)

master-bin.001	79	Query	1	79	use `test`; create table t1 type=HEAP select 10 as a

master-bin.001	154	Query	1	154	use `test`; insert into t1 values(11)

reset slave;

start slave;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) default NULL

  `a` bigint(2) NOT NULL default '0'

) TYPE=HEAP

select * from t1;

a

10

11

select * from t1;

a

select * from t1 limit 10;

mysql-test/t/rpl_heap.test

+4 −2
Original line number Diff line number Diff line
@@ -13,8 +13,10 @@ connect (slave,localhost,root,,test,0,slave.sock); 
connection master;

reset master;

drop table if exists t1;

create table t1 (a int) type=HEAP;

insert into t1 values(10);

# we use CREATE SELECT to verify that DELETE does not get into binlog

# before CREATE SELECT

create table t1 type=HEAP select 10 as a;

insert into t1 values(11);

save_master_pos;

show binlog events from 79;

connection slave;