summaryrefslogtreecommitdiff
path: root/sql/log.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-08-30 15:03:55 +0200
committerSergei Golubchik <serg@mariadb.org>2015-09-04 10:33:52 +0200
commit2d2286faf3085160dbe345fe403c11c712a358ff (patch)
treef69bbeda6f3fe6bb26a2d132500d973f41f5881b /sql/log.h
parent86b06a0e52b7583858df81fec8bd57cfe02b9999 (diff)
downloadmariadb-git-2d2286faf3085160dbe345fe403c11c712a358ff.tar.gz
cleanup: use enum_binlog_checksum_alg, not uint8
* fix unireg.h includes * use enum_binlog_checksum_alg for binlog checksum variables, not uint8
Diffstat (limited to 'sql/log.h')
-rw-r--r--sql/log.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/log.h b/sql/log.h
index 73faf8cfce9..fcec606443f 100644
--- a/sql/log.h
+++ b/sql/log.h
@@ -17,10 +17,10 @@
#ifndef LOG_H
#define LOG_H
-#include "unireg.h" // REQUIRED: for other includes
#include "handler.h" /* my_xid */
#include "wsrep.h"
#include "wsrep_mysqld.h"
+#include "rpl_constants.h"
class Relay_log_info;
@@ -591,7 +591,7 @@ public:
/* This is relay log */
bool is_relay_log;
ulong signal_cnt; // update of the counter is checked by heartbeat
- uint8 checksum_alg_reset; // to contain a new value when binlog is rotated
+ enum enum_binlog_checksum_alg checksum_alg_reset; // to contain a new value when binlog is rotated
/*
Holds the last seen in Relay-Log FD's checksum alg value.
The initial value comes from the slave's local FD that heads
@@ -625,7 +625,7 @@ public:
(A) - checksum algorithm descriptor value
FD.(A) - the value of (A) in FD
*/
- uint8 relay_log_checksum_alg;
+ enum enum_binlog_checksum_alg relay_log_checksum_alg;
/*
These describe the log's format. This is used only for relay logs.
_for_exec is used by the SQL thread, _for_queue by the I/O thread. It's