Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0

#define HAVE_SETFILEPOINTER

#define HAVE_VIO

#define HAME_MMAP               /* in mysys/my_mmap.c */

#define HAVE_GETPAGESIZE        /* in mysys/my_mmap.c */

#ifdef NOT_USED

#define HAVE_SNPRINTF		/* Gave link error */

#define _snprintf snprintf

ulonglong my_getsystime(void);

my_bool my_gethwaddr(uchar *to);

#ifdef HAVE_MMAP

#ifdef HAVE_SYS_MMAN_H

#include <sys/mman.h>

#ifndef MAP_NOSYNC

#define MAP_NOSYNC       0x0800

#define MAP_FAILED       ((void *)-1)

#define MS_SYNC          0x0000

#define HAVE_MMAP

int my_getpagesize(void);

void *my_mmap(void *, size_t, int, int, int, my_off_t);

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

ROLLBACK;

use test;

SET TIMESTAMP=1065204671;

SET TIMESTAMP=1108844556;

BEGIN;

SET TIMESTAMP=1108844555;

insert t1 values (1);

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

use test;

SET TIMESTAMP=1065204671;

SET TIMESTAMP=1108844556;

BEGIN;

SET TIMESTAMP=1108844555;

insert t1 values (1);

drop table t1, t2;

start slave;

stop slave;

flush logs;

create table t1 (a int) engine=bdb;

reset slave;

start slave;

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

#	127.0.0.1	root	MASTER_PORT	1	master-bin.000002	4	#	#	master-bin.000001	Yes	No							0	Rolling back unfinished transaction (no COMMIT or ROLLBACK) from relay log. A probable cause is that the master died while writing the transaction to its binary log.	0	79	#	None		0	No						#

#	127.0.0.1	root	MASTER_PORT	1	master-bin.000002	4	#	#	master-bin.000002	Yes	Yes							0	Rolling back unfinished transaction (no COMMIT or ROLLBACK) from relay log. A probable cause is that the master died while writing the transaction to its binary log.	0	4	#	None		0	No						#

select * from t1;

a

drop table t1;