diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-07-04 03:18:15 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-07-04 03:18:15 +0300 |
| commit | 2d5d754c8c28ca087f44f479e0fca614789b42e5 (patch) | |
| tree | eaf3cc9d9913bdfe213c549f3890aa25f565ca8b /sql/slave.h | |
| parent | db5283b30667c9d427228069314f53d38c4ef8f1 (diff) | |
| download | mariadb-git-2d5d754c8c28ca087f44f479e0fca614789b42e5.tar.gz | |
Status query on killed mysql connection results in segmentation fault (Bug #738)
Added MAX_PASSWORD_LENGTH. This increased master-slave passwords to 32 bytes (Bug #766)
Fixed server crash on purge master logs or show master logs when binlog is off. (Bug #733)
client/mysql.cc:
status query on killed mysql connection results in segmentation fault (Bug #738)
configure.in:
Portability fix for Unixware
include/my_global.h:
Removed wrong patch from previous changeset
sql/mysql_priv.h:
Added MAX_PASSWORD_LENGTH. This increased master-slave passwords to 32 bytes
sql/slave.h:
Optimized structure
sql/sql_repl.cc:
Memory overrun safety fixes (not critical)
Fixed server crash on purge master logs or show master logs when binlog is off. (Bug #733)
sql/sql_repl.h:
Fixed to use right define
strings/strmake.c:
Fixed comment
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sql/slave.h b/sql/slave.h index 6a73c86d304..cae8c6ae241 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -250,20 +250,20 @@ Log_event* next_event(RELAY_LOG_INFO* rli); typedef struct st_master_info { char master_log_name[FN_REFLEN]; + char host[HOSTNAME_LENGTH+1]; + char user[USERNAME_LENGTH+1]; + char password[MAX_PASSWORD_LENGTH+1]; my_off_t master_log_pos; File fd; // we keep the file open, so we need to remember the file pointer IO_CACHE file; /* the variables below are needed because we can change masters on the fly */ - char host[HOSTNAME_LENGTH+1]; - char user[USERNAME_LENGTH+1]; - char password[HASH_PASSWORD_LENGTH+1]; pthread_mutex_t data_lock,run_lock; pthread_cond_t data_cond,start_cond,stop_cond; THD *io_thd; MYSQL* mysql; - uint32 file_id; /* for 3.23 load data infile */ + uint32 file_id; /* for 3.23 load data infile */ RELAY_LOG_INFO rli; uint port; uint connect_retry; @@ -271,12 +271,11 @@ typedef struct st_master_info int events_till_abort; #endif bool inited; - enum enum_binlog_formats old_format; /* master binlog is in 3.23 format */ + enum enum_binlog_formats old_format; /* binlog is in 3.23 format */ volatile bool abort_slave, slave_running; volatile ulong slave_run_id; bool ignore_stop_event; - st_master_info() :fd(-1), io_thd(0), inited(0), old_format(BINLOG_FORMAT_CURRENT), abort_slave(0),slave_running(0), slave_run_id(0) |