diff options
| author | unknown <guilhem@mysql.com> | 2005-03-02 11:29:48 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2005-03-02 11:29:48 +0100 |
| commit | d7e0784c65b44f3fa36f602e5f1d7579eed6b88b (patch) | |
| tree | a63b632fd76de92b2e46c444930abb8d50336b2d /sql/slave.h | |
| parent | 3087b2f1fde43ea192bcf7a2fa217aadc7bf7d3a (diff) | |
| download | mariadb-git-d7e0784c65b44f3fa36f602e5f1d7579eed6b88b.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).
sql/mysql_priv.h:
new var slave_transaction_retries
sql/mysqld.cc:
new variable slave_transaction_retries. Plus fixing a typo.
sql/set_var.cc:
new global variable slave_transaction_retries (will be one per subslave, when we have multimaster).
sql/slave.cc:
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 (--slave_transaction_retries).
sql/slave.h:
new RELAY_LOG_INFO::trans_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(); |