Commit 62a6a0fd authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

bug fixes in server-id, moved replication functionality to 

sql_repl.* will push this one, since the replication code now works
parent 079d8590

repl-tests/test-dump/run.test

+8 −0
Original line number Diff line number Diff line 
source ../include/master-slave.inc;

connection slave;

!slave stop;

flush slave;

connection master;

flush master;

connection slave;

slave start;

connection master;

use test;

drop table if exists words;
@@ -7,6 +14,7 @@ load data infile '/usr/dict/words' into table words; 
drop table if exists words1;

create table words1 (word char(20) not null);

load data infile '/usr/dict/words' into table words1;

sleep 5;

connection slave;

use test;

drop table if exists words;

sql/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ 
			opt_range.h \

			sql_select.h structs.h table.h sql_udf.h hash_filo.h\

			lex.h lex_symbol.h sql_acl.h sql_crypt.h md5.h \

                        log_event.h mini_client.h

                        log_event.h mini_client.h sql_repl.h

mysqld_SOURCES =	sql_lex.cc \

			item.cc item_sum.cc item_buff.cc item_func.cc \

			item_cmpfunc.cc item_strfunc.cc item_timefunc.cc \
@@ -69,7 +69,7 @@ mysqld_SOURCES = sql_lex.cc \ 
			sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \

			sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \

			sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \

			slave.cc \

			slave.cc sql_repl.cc \

			md5.c log_event.cc mini_client.cc mini_client_errors.c

gen_lex_hash_SOURCES =	gen_lex_hash.cc

gen_lex_hash_LDADD =	$(LDADD) $(CXXLDFLAGS)

sql/log_event.cc

+0 −10
Original line number Diff line number Diff line
@@ -22,16 +22,6 @@ 
#include  "mysql_priv.h"

#endif /* MYSQL_CLIENT */



#define LOG_EVENT_HEADER_LEN 13

#define QUERY_HEADER_LEN     (sizeof(uint32) + sizeof(uint32) + sizeof(uchar))

#define LOAD_HEADER_LEN      (sizeof(uint32) + sizeof(uint32) + \

  + sizeof(uint32) + 2 + sizeof(uint32))

#define EVENT_LEN_OFFSET     9

#define EVENT_TYPE_OFFSET    4

#define MAX_EVENT_LEN        4*1024*1024 

#define QUERY_EVENT_OVERHEAD  LOG_EVENT_HEADER_LEN+QUERY_HEADER_LEN

#define ROTATE_EVENT_OVERHEAD LOG_EVENT_HEADER_LEN

#define LOAD_EVENT_OVERHEAD   (LOG_EVENT_HEADER_LEN+LOAD_HEADER_LEN+sizeof(sql_ex_info))



static void pretty_print_char(FILE* file, int c)

{

sql/log_event.h

+13 −1
Original line number Diff line number Diff line
@@ -30,6 +30,18 @@ 
#define LOG_EVENT_OFFSET 4

#define BINLOG_VERSION    1



#define LOG_EVENT_HEADER_LEN 13

#define QUERY_HEADER_LEN     (sizeof(uint32) + sizeof(uint32) + sizeof(uchar))

#define LOAD_HEADER_LEN      (sizeof(uint32) + sizeof(uint32) + \

  + sizeof(uint32) + 2 + sizeof(uint32))

#define EVENT_LEN_OFFSET     9

#define EVENT_TYPE_OFFSET    4

#define MAX_EVENT_LEN        4*1024*1024 

#define QUERY_EVENT_OVERHEAD  LOG_EVENT_HEADER_LEN+QUERY_HEADER_LEN

#define ROTATE_EVENT_OVERHEAD LOG_EVENT_HEADER_LEN

#define LOAD_EVENT_OVERHEAD   (LOG_EVENT_HEADER_LEN+LOAD_HEADER_LEN+sizeof(sql_ex_info))





enum Log_event_type { START_EVENT = 1, QUERY_EVENT =2,

		      STOP_EVENT=3, ROTATE_EVENT = 4, INTVAR_EVENT=5,

                      LOAD_EVENT=6};
@@ -101,7 +113,7 @@ class Query_log_event: public Log_event 
#if !defined(MYSQL_CLIENT)

  THD* thd;

  Query_log_event(THD* thd_arg, const char* query_arg):

    Log_event(thd_arg->start_time,0,0,thd->server_id), data_buf(0),

    Log_event(thd_arg->start_time,0,0,thd_arg->server_id), data_buf(0),

    query(query_arg),  db(thd_arg->db), q_len(thd_arg->query_length),

    thread_id(thd_arg->thread_id), thd(thd_arg)

  {

sql/mysql_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ extern pthread_mutex_t LOCK_mysql_create_db,LOCK_Acl,LOCK_open, 
       LOCK_thread_count,LOCK_mapped_file,LOCK_user_locks, LOCK_status,

       LOCK_grant, LOCK_error_log, LOCK_delayed_insert,

       LOCK_delayed_status, LOCK_delayed_create, LOCK_crypt, LOCK_timezone,

       LOCK_binlog_update, LOCK_slave;

       LOCK_binlog_update, LOCK_slave, LOCK_server_id;

extern pthread_cond_t COND_refresh,COND_thread_count, COND_binlog_update,

  COND_slave_stopped;

extern pthread_attr_t connection_attrib;