Commit a300406b authored by unknown's avatar unknown
Browse files

A better, but larger fix for server_id bug ..

parent 5247c5bf

client/mysqlbinlog.cc

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ extern "C" 
#endif



char server_version[SERVER_VERSION_LENGTH];

uint32 server_id = 0;

ulong server_id = 0;



// needed by net_serv.c

ulong bytes_sent = 0L, bytes_received = 0L;

sql/log_event.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ enum Int_event_type { INVALID_INT_EVENT = 0, LAST_INSERT_ID_EVENT = 1, INSERT_ID 
class String;

#endif



extern uint32 server_id;

extern ulong server_id;



class Log_event

{

sql/mysql_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ void sql_perror(const char *message); 
void sql_print_error(const char *format,...)

	        __attribute__ ((format (printf, 1, 2)));



extern uint32 server_id;

extern ulong  server_id;

extern char mysql_data_home[2],server_version[SERVER_VERSION_LENGTH],

	    max_sort_char, mysql_real_data_home[];

extern my_string mysql_unix_port,mysql_tmpdir;

sql/mysqld.cc

+3 −3
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ I_List<i_string> replicate_do_db, replicate_ignore_db; 
I_List<i_string> binlog_do_db, binlog_ignore_db;



/* if we guessed server_id , we need to know about it */

uint32 server_id = 0;

ulong server_id = 0;

bool server_id_supplied = 0;



uint mysql_port;
@@ -3162,7 +3162,7 @@ struct show_var_st init_vars[]= { 
  {"record_rnd_buffer",       (char*) &record_rnd_cache_size,	    SHOW_LONG},

  {"query_buffer_size",       (char*) &query_buff_size,		    SHOW_LONG},

  {"safe_show_database",      (char*) &opt_safe_show_db,            SHOW_BOOL},

  {"server_id",               (char*) &server_id,		    SHOW_INT},

  {"server_id",               (char*) &server_id,		    SHOW_LONG},

  {"slave_net_timeout",       (char*) &slave_net_timeout,	    SHOW_LONG},

  {"skip_locking",            (char*) &my_disable_locking,          SHOW_MY_BOOL},

  {"skip_networking",         (char*) &opt_disable_networking,      SHOW_BOOL},
@@ -3966,7 +3966,7 @@ static void get_options(int argc,char **argv) 
      break;

    }

    case OPT_SERVER_ID:

      server_id = atoi(optarg);

      server_id = atol(optarg);

      server_id_supplied = 1;

      break;

    case OPT_DELAY_KEY_WRITE:

sql/sql_repl.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


extern char* master_host;

extern my_string opt_bin_logname, master_info_file;

extern uint32 server_id;

extern ulong server_id;

extern bool server_id_supplied;

extern I_List<i_string> binlog_do_db, binlog_ignore_db;