diff options
| author | Luis Soares <luis.soares@oracle.com> | 2010-10-11 15:50:14 +0100 |
|---|---|---|
| committer | Luis Soares <luis.soares@oracle.com> | 2010-10-11 15:50:14 +0100 |
| commit | 86de24edee2db6b1c3f29f197ba4972b0e4f5acf (patch) | |
| tree | 7ae955e00bf9f940c017f9e31fb13a04829d04bc /sql/repl_failsafe.cc | |
| parent | d659cc54f961b14545df0b44f7f8538fd23f7fe7 (diff) | |
| download | mariadb-git-86de24edee2db6b1c3f29f197ba4972b0e4f5acf.tar.gz | |
Fix for crash in mysqld --verbose --help while initializing option
for --init-rpl-role.
Problem: There are two variables involved in this issue,
rpl_status and rpl_role_type. The former is an array containing
the description of the possible values for the latter.
rpl_status is declared as an enumeration and is stored in a 4
bytes integer. On the other hand, my_getopt, reads enum values
into a ulong:
*(ulong*)value= arg;
This is overwriting the memory used for rpl_role_type,
corrupting the first entry in the array.
Fix: We fix this by re-declaring rpl_status as a ulong, so that it
has space to accommodate the value "parsed" in my_getopt .
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 47eb2f7031d..540b62b9d3b 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -41,7 +41,7 @@ #define SLAVE_ERRMSG_SIZE (FN_REFLEN+64) -RPL_STATUS rpl_status=RPL_NULL; +ulong rpl_status=RPL_NULL; mysql_mutex_t LOCK_rpl_status; mysql_cond_t COND_rpl_status; HASH slave_list; @@ -68,7 +68,7 @@ static Slave_log_event* find_slave_event(IO_CACHE* log, functions like register_slave()) are working. */ -void change_rpl_status(RPL_STATUS from_status, RPL_STATUS to_status) +void change_rpl_status(ulong from_status, ulong to_status) { mysql_mutex_lock(&LOCK_rpl_status); if (rpl_status == from_status || rpl_status == RPL_ANY) |