diff options
| author | guilhem@mysql.com <> | 2005-03-02 11:29:48 +0100 |
|---|---|---|
| committer | guilhem@mysql.com <> | 2005-03-02 11:29:48 +0100 |
| commit | 11a1c83c03285ccf6e28a7849f272323a493424b (patch) | |
| tree | a63b632fd76de92b2e46c444930abb8d50336b2d /sql/slave.h | |
| parent | cbc8b5c3c8c4ee0dd65d469e250549074f7fc795 (diff) | |
| download | mariadb-git-11a1c83c03285ccf6e28a7849f272323a493424b.tar.gz | |
Fix for BUG#8325 "Deadlock in replication thread stops replication":
in slave SQL thread: if a transaction fails because of InnoDB deadlock or innodb_lock_wait_timeout exceeded,
optionally retry the transaction a certain number of times (new variable --slave_transaction_retries).
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/slave.h b/sql/slave.h index bcd79dd4a39..fb7560ec738 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -294,7 +294,9 @@ typedef struct st_relay_log_info UNTIL_LOG_NAMES_CMP_UNKNOWN= -2, UNTIL_LOG_NAMES_CMP_LESS= -1, UNTIL_LOG_NAMES_CMP_EQUAL= 0, UNTIL_LOG_NAMES_CMP_GREATER= 1 } until_log_names_cmp_result; - + + ulong trans_retries; + st_relay_log_info(); ~st_relay_log_info(); |