diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-09-10 13:22:44 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-09-10 13:22:44 +0200 |
| commit | 30d7860504d58d645071ae1baf8572f03a90a994 (patch) | |
| tree | af54dc0cdd6040b0298f0c53c71b5846e3b2d628 /sql/rpl_rli.h | |
| parent | b2c54a9a699daa8ffd9bb500f3405dacd7eb347b (diff) | |
| download | mariadb-git-30d7860504d58d645071ae1baf8572f03a90a994.tar.gz | |
MDEV-6459 max_relay_log_size and sql_slave_skip_counter misbehave on PPC64
make slave_skip_counter and max_relay_log_size ulonglong
(sysvars should generally never be ulong)
Diffstat (limited to 'sql/rpl_rli.h')
| -rw-r--r-- | sql/rpl_rli.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h index 25c6fabec30..3a8d87030ad 100644 --- a/sql/rpl_rli.h +++ b/sql/rpl_rli.h @@ -251,10 +251,11 @@ public: errors, and have been manually applied by DBA already. Must be ulong as it's refered to from set_var.cc */ - volatile ulong slave_skip_counter; + volatile ulonglong slave_skip_counter; + ulonglong max_relay_log_size; + volatile ulong abort_pos_wait; /* Incremented on change master */ volatile ulong slave_run_id; /* Incremented on slave start */ - ulong max_relay_log_size; mysql_mutex_t log_space_lock; mysql_cond_t log_space_cond; /* |