diff options
| author | He Zhenxing <zhenxing.he@sun.com> | 2009-10-03 13:00:05 +0800 |
|---|---|---|
| committer | He Zhenxing <zhenxing.he@sun.com> | 2009-10-03 13:00:05 +0800 |
| commit | d8b4e637a07cea438c03747e33a7d82a18aa5e71 (patch) | |
| tree | 435b1fd403249cb432ba1b0c8f2eaeaca4cb078b /plugin | |
| parent | 04c6e8ff0746baa14c0017e2f37e2e2f77786a2b (diff) | |
| download | mariadb-git-d8b4e637a07cea438c03747e33a7d82a18aa5e71.tar.gz | |
Fix semisync master/slave status always showed as OFF on sparc
On sparc, semisync master/slave status is always showed as OFF, this
is fixed by change rpl_semisync_master/slave_status variables from
long to char.
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/semisync/semisync_master.cc | 2 | ||||
| -rw-r--r-- | plugin/semisync/semisync_master.h | 2 | ||||
| -rw-r--r-- | plugin/semisync/semisync_slave.cc | 2 | ||||
| -rw-r--r-- | plugin/semisync/semisync_slave.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/plugin/semisync/semisync_master.cc b/plugin/semisync/semisync_master.cc index b3454c49829..3641b658268 100644 --- a/plugin/semisync/semisync_master.cc +++ b/plugin/semisync/semisync_master.cc @@ -25,7 +25,7 @@ char rpl_semi_sync_master_enabled; unsigned long rpl_semi_sync_master_timeout; unsigned long rpl_semi_sync_master_trace_level; -unsigned long rpl_semi_sync_master_status = 0; +char rpl_semi_sync_master_status = 0; unsigned long rpl_semi_sync_master_yes_transactions = 0; unsigned long rpl_semi_sync_master_no_transactions = 0; unsigned long rpl_semi_sync_master_off_times = 0; diff --git a/plugin/semisync/semisync_master.h b/plugin/semisync/semisync_master.h index a1697b2ae67..bb63cece18a 100644 --- a/plugin/semisync/semisync_master.h +++ b/plugin/semisync/semisync_master.h @@ -347,7 +347,7 @@ class ReplSemiSyncMaster extern char rpl_semi_sync_master_enabled; extern unsigned long rpl_semi_sync_master_timeout; extern unsigned long rpl_semi_sync_master_trace_level; -extern unsigned long rpl_semi_sync_master_status; +extern char rpl_semi_sync_master_status; extern unsigned long rpl_semi_sync_master_yes_transactions; extern unsigned long rpl_semi_sync_master_no_transactions; extern unsigned long rpl_semi_sync_master_off_times; diff --git a/plugin/semisync/semisync_slave.cc b/plugin/semisync/semisync_slave.cc index f6bbb17ce9d..3298ce316a8 100644 --- a/plugin/semisync/semisync_slave.cc +++ b/plugin/semisync/semisync_slave.cc @@ -17,7 +17,7 @@ #include "semisync_slave.h" char rpl_semi_sync_slave_enabled; -unsigned long rpl_semi_sync_slave_status= 0; +char rpl_semi_sync_slave_status= 0; unsigned long rpl_semi_sync_slave_trace_level; int ReplSemiSyncSlave::initObject() diff --git a/plugin/semisync/semisync_slave.h b/plugin/semisync/semisync_slave.h index 73bc8aeeade..16fa31c69eb 100644 --- a/plugin/semisync/semisync_slave.h +++ b/plugin/semisync/semisync_slave.h @@ -94,6 +94,6 @@ private: /* System and status variables for the slave component */ extern char rpl_semi_sync_slave_enabled; extern unsigned long rpl_semi_sync_slave_trace_level; -extern unsigned long rpl_semi_sync_slave_status; +extern char rpl_semi_sync_slave_status; #endif /* SEMISYNC_SLAVE_H */ |