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

repl-tests/test-repl-ts/repl-timestamp.master.reject 

    this file needs to be deleted
sql/log_event.cc
    fixed warnings
sql/log_event.h
    fixed () #define bug
sql/mysqlbinlog.cc
    fixed length argument - was supposed to be one less
sql/mysqld.cc
    replicate-do/ignore-table now works, wild does not yet
sql/mysql_priv.h
    updating argument to add_table_to_list() -- needed for replicate-do/ignore table
sql/slave.cc
    changes fore replicate-do/ignore-table
    close the socket before going to sleep sleeping after error
    bad event was being freed too early
sql/slave.h
    changes for replicate-do/ignore-table
sql/sql_class.cc
    slave_thread variable to THD
sql/sql_class.h
    added slave_thread to THD, fixed bug in end_time()
sql/sql_parse.cc
    updating argument to add_tables_to_list()
sql/sql_table.cc
    fixed bug in mysql_rm_table()
sql/sql_yacc.yy
    fixed up add_table_to_list() calls to accept updating argument
sql/table.h
    added updating to TABLE_LIST
parent d2340770

repl-tests/test-repl-ts/repl-timestamp.master.reject

+1 −1
Original line number Diff line number Diff line 
unix_timestamp(t)	

973302660	
973999074

sql/log_event.cc

+4 −5
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ void Log_event::print_header(FILE* file) 
{

  fputc('#', file);

  print_timestamp(file);

  fprintf(file, " server id  %ld ", server_id); 

  fprintf(file, " server id  %d ", server_id); 

}



void Log_event::print_timestamp(FILE* file, time_t* ts)
@@ -421,12 +421,11 @@ Query_log_event::Query_log_event(FILE* file, time_t when_arg, 
Query_log_event::Query_log_event(const char* buf, int event_len):

  Log_event(buf),data_buf(0), query(NULL), db(NULL)

{

  if (event_len < QUERY_EVENT_OVERHEAD)

  if ((uint)event_len < QUERY_EVENT_OVERHEAD)

    return;				

  ulong data_len;

  buf += EVENT_LEN_OFFSET;

  data_len = event_len - QUERY_EVENT_OVERHEAD;



  exec_time = uint4korr(buf + 8);

  error_code = uint2korr(buf + 13);
@@ -613,7 +612,7 @@ Load_log_event::Load_log_event(const char* buf, int event_len): 
{

  ulong data_len;



  if(event_len < (LOAD_EVENT_OVERHEAD + LOG_EVENT_HEADER_LEN))

  if((uint)event_len < (LOAD_EVENT_OVERHEAD + LOG_EVENT_HEADER_LEN))

    return;



  buf += EVENT_LEN_OFFSET;
@@ -709,7 +708,7 @@ void Load_log_event::print(FILE* file, bool short_form) 
  }

     

  if((int)skip_lines > 0)

    fprintf(file, " IGNORE %ld LINES ", skip_lines);

    fprintf(file, " IGNORE %d LINES ", skip_lines);



  if(num_fields)

    {

sql/log_event.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#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 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))

sql/mysql_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -362,6 +362,7 @@ bool add_field_to_list(char *field_name, enum enum_field_types type, 
void store_position_for_column(const char *name);

bool add_to_list(SQL_LIST &list,Item *group,bool asc=0);

TABLE_LIST *add_table_to_list(Table_ident *table,LEX_STRING *alias,

			      bool updating,

			      thr_lock_type flags=TL_UNLOCK,

			      List<String> *use_index=0,

			      List<String> *ignore_index=0);

sql/mysqlbinlog.cc

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ Unfortunately, no sweepstakes today, adjusted position to 4\n"); 
			len, net->read_pos[5]));

    Log_event * ev = Log_event::read_log_event(

					  (const char*) net->read_pos + 1 ,

					  len);

					  len - 1);

    if(ev)

    {

      ev->print(stdout, short_form);