Commit 684f13ef authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

Ugly merge! But I am not done yet - there are a number of things I need to fix 

before I can push
parents d7ad2cbe 56129ce6

.bzrignore

+7 −1
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ libmysqld/get_password.c 
libmysqld/ha_berkeley.cc

libmysqld/ha_heap.cc

libmysqld/ha_innobase.cc

libmysqld/ha_innodb.cc

libmysqld/ha_isam.cc

libmysqld/ha_isammrg.cc

libmysqld/ha_myisam.cc
@@ -344,7 +345,13 @@ mysql-test/gmon.out 
mysql-test/install_test_db

mysql-test/mysql-test-run

mysql-test/r/*.reject

mysql-test/r/rpl000002.eval

mysql-test/r/rpl000014.eval

mysql-test/r/rpl000015.eval

mysql-test/r/rpl000016.eval

mysql-test/r/rpl_log.eval

mysql-test/r/slave-running.eval

mysql-test/r/slave-stopped.eval

mysql-test/share/mysql

mysql-test/var/*

mysql.kdevprj
@@ -451,4 +458,3 @@ vio/test-ssl 
vio/test-sslclient

vio/test-sslserver

vio/viotest-ssl
 
libmysqld/ha_innodb.cc

Makefile.am

+2 −5
Original line number Diff line number Diff line
@@ -75,14 +75,11 @@ bin-dist: all 
	$(top_builddir)/scripts/make_binary_distribution



tags:

	rm -f TAGS

	find -not -path \*SCCS\* -and \

	\( -name \*.cc -or -name \*.h -or -name \*.yy -or -name \*.c \) \

	-print -exec etags -o TAGS --append {} \;



	support-files/build-tags

.PHONY:		init-db bin-dist



# Test installation



test:

	cd mysql-test ; ./mysql-test-run

include/my_sys.h

+76 −4
Original line number Diff line number Diff line
@@ -293,35 +293,105 @@ typedef int (*IO_CACHE_CALLBACK)(struct st_io_cache*); 


typedef struct st_io_cache		/* Used when cacheing files */

{

  /* pos_in_file is offset in file corresponding to the first byte of

     byte* buffer. end_of_file is the offset of end of file for READ_CACHE

     and WRITE_CACHE. For SEQ_READ_APPEND it the maximum of the actual

     end of file and the position represented by read_end.

  */

  my_off_t pos_in_file,end_of_file;

  /* read_pos points to current read position in the buffer

     read_end is the non-inclusive boundary in the buffer for the currently

     valid read area

     buffer is the read buffer

     not sure about request_pos except that it is used in async_io

  */

  byte	*read_pos,*read_end,*buffer,*request_pos;

  /* write_buffer is used only in WRITE caches and in SEQ_READ_APPEND to

     buffer writes

     append_read_pos is only used in SEQ_READ_APPEND, and points to the

     current read position in the write buffer. Note that reads in

     SEQ_READ_APPEND caches can happen from both read buffer (byte* buffer),

     and write buffer (byte* write_buffer).

     write_pos points to current write position in the write buffer and

     write_end is the non-inclusive boundary of the valid write area

  */

  byte  *write_buffer, *append_read_pos, *write_pos, *write_end;

  /* current_pos and current_end are convenience variables used by

     my_b_tell() and other routines that need to know the current offset

     current_pos points to &write_pos, and current_end to &write_end in a

     WRITE_CACHE, and &read_pos and &read_end respectively otherwise

  */

  byte  **current_pos, **current_end;

/* The lock is for append buffer used in READ_APPEND cache */

/* The lock is for append buffer used in SEQ_READ_APPEND cache */

#ifdef THREAD

  pthread_mutex_t append_buffer_lock;

  /* need mutex copying from append buffer to read buffer */

#endif

  /* a caller will use my_b_read() macro to read from the cache

     if the data is already in cache, it will be simply copied with

     memcpy() and internal variables will be accordinging updated with

     no functions invoked. However, if the data is not fully in the cache,

     my_b_read() will call read_function to fetch the data. read_function

     must never be invoked directly

  */

  int (*read_function)(struct st_io_cache *,byte *,uint);

  /* same idea as in the case of read_function, except my_b_write() needs to

     be replaced with my_b_append() for a SEQ_READ_APPEND cache

  */

  int (*write_function)(struct st_io_cache *,const byte *,uint);

  /* specifies the type of the cache. Depending on the type of the cache

     certain operations might not be available and yield unpredicatable

     results. Details to be documented later

  */

  enum cache_type type;

  /* callbacks when the actual read I/O happens */

  /* callbacks when the actual read I/O happens. These were added and

   are currently used for binary logging of LOAD DATA INFILE - when a

   block is read from the file, we create a block create/append event, and

   when IO_CACHE is closed, we create an end event. These functions could,

   of course be used for other things

  */

  IO_CACHE_CALLBACK pre_read;

  IO_CACHE_CALLBACK post_read;

  IO_CACHE_CALLBACK pre_close;

  void* arg; /* for use by pre/post_read */

  char *file_name;			/* if used with 'open_cached_file' */

  char *dir,*prefix;

  File file;

  File file; /* file descriptor */

  /* seek_not_done is set by my_b_seek() to inform the upcoming read/write

     operation that a seek needs to be preformed prior to the actual I/O

     error is 0 if the cache operation was successful, -1 if there was a

     "hard" error, and the actual number of I/O-ed bytes if the read/write was

     partial

  */

  int	seek_not_done,error;

  /* buffer_length is the size of memory allocated for buffer or write_buffer

     read_length is the same as buffer_length except when we use async io

     not sure why we need it

   */

  uint	buffer_length,read_length;

  myf	myflags;			/* Flags used to my_read/my_write */

 /*

   alloced_buffer is 1 if the buffer was allocated by init_io_cache() and

   0 if it was supplied by the user

   Currently READ_NET is the only one that will use a buffer allocated

   somewhere else

 */

  my_bool alloced_buffer;

  /* init_count is incremented every time we call init_io_cache()

     It is not reset in end_io_cache(). This variable

     was introduced for slave relay logs - RELAY_LOG_INFO stores a pointer

     to IO_CACHE that could in some cases refer to the IO_CACHE of the

     currently active relay log. The IO_CACHE then could be closed,

     re-opened and start pointing to a different log file. In that case,

     we could not know reliably if this happened without init_count

     one must be careful with bzero() prior to the subsequent init_io_cache()

     call

  */

  int init_count;

#ifdef HAVE_AIOWAIT

  /* as inidicated by ifdef, this is for async I/O, we will have

     Sinisa comment this some time

  */

  uint inited;

  my_off_t aio_read_pos;

  my_aio_result aio_result;
@@ -366,6 +436,8 @@ typedef int (*qsort2_cmp)(const void *, const void *, const void *); 


#define my_b_tell(info) ((info)->pos_in_file + \

			 (uint) (*(info)->current_pos - (info)->request_pos))

#define my_b_append_tell(info) ((info)->end_of_file + \

			 (uint) ((info)->write_pos - (info)->write_buffer))



#define my_b_bytes_in_cache(info) (uint) (*(info)->current_end - \

					  *(info)->current_pos)

libmysqld/lib_sql.cc

+7 −4
Original line number Diff line number Diff line
@@ -402,8 +402,8 @@ int STDCALL mysql_server_init(int argc, char **argv, char **groups) 
  (void) pthread_mutex_init(&LOCK_bytes_sent,MY_MUTEX_INIT_FAST);

  (void) pthread_mutex_init(&LOCK_bytes_received,MY_MUTEX_INIT_FAST);

  (void) pthread_mutex_init(&LOCK_timezone,MY_MUTEX_INIT_FAST);

  (void) pthread_mutex_init(&LOCK_binlog_update, MY_MUTEX_INIT_FAST);	// QQ NOT USED

  (void) pthread_mutex_init(&LOCK_slave, MY_MUTEX_INIT_FAST);

  (void) pthread_mutex_init(&LOCK_slave_io, MY_MUTEX_INIT_FAST);

  (void) pthread_mutex_init(&LOCK_slave_sql, MY_MUTEX_INIT_FAST);

  (void) pthread_mutex_init(&LOCK_server_id, MY_MUTEX_INIT_FAST);

  (void) pthread_mutex_init(&LOCK_user_conn, MY_MUTEX_INIT_FAST);

  (void) pthread_cond_init(&COND_thread_count,NULL);
@@ -412,8 +412,11 @@ int STDCALL mysql_server_init(int argc, char **argv, char **groups) 
  (void) pthread_cond_init(&COND_flush_thread_cache,NULL);

  (void) pthread_cond_init(&COND_manager,NULL);

  (void) pthread_cond_init(&COND_binlog_update, NULL);

  (void) pthread_cond_init(&COND_slave_stopped, NULL);

  (void) pthread_cond_init(&COND_slave_start, NULL);

  (void) pthread_cond_init(&COND_slave_log_update, NULL);

  (void) pthread_cond_init(&COND_slave_sql_stop, NULL);

  (void) pthread_cond_init(&COND_slave_sql_start, NULL);

  (void) pthread_cond_init(&COND_slave_sql_stop, NULL);

  (void) pthread_cond_init(&COND_slave_sql_start, NULL);



  if (set_default_charset_by_name(default_charset, MYF(MY_WME)))

  {

mysql-test/r/rpl000014.result

+8 −8
Original line number Diff line number Diff line
@@ -7,22 +7,22 @@ show master status; 
File	Position	Binlog_do_db	Binlog_ignore_db

master-bin.001	79		

show slave status;

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq

127.0.0.1	root	MASTER_PORT	1	master-bin.001	79	Yes			0		0	1

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	Last_errno	Last_error	Skip_counter	Exec_master_log_pos

127.0.0.1	root	9306	1	master-bin.001	79	mysql-relay-bin.002	120	master-bin.001	Yes	Yes			0		0	79

change master to master_log_pos=73;

slave stop;

change master to master_log_pos=73;

show slave status;

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq

127.0.0.1	root	MASTER_PORT	1	master-bin.001	73	No			0		0	1

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	Last_errno	Last_error	Skip_counter	Exec_master_log_pos

127.0.0.1	root	9306	1	master-bin.001	73	mysql-relay-bin.001	4	master-bin.001	No	No			0		0	73

slave start;

show slave status;

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq

127.0.0.1	root	MASTER_PORT	1	master-bin.001	73	Yes			0		0	1

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	Last_errno	Last_error	Skip_counter	Exec_master_log_pos

127.0.0.1	root	9306	1	master-bin.001	73	mysql-relay-bin.001	4	master-bin.001	Yes	Yes			0		0	73

change master to master_log_pos=173;

show slave status;

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq

127.0.0.1	root	MASTER_PORT	1	master-bin.001	173	Yes			0		0	1

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	Last_errno	Last_error	Skip_counter	Exec_master_log_pos

127.0.0.1	root	9306	1	master-bin.001	173	mysql-relay-bin.001	4	master-bin.001	Yes	Yes			0		0	173

show master status;

File	Position	Binlog_do_db	Binlog_ignore_db

master-bin.001	79