diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2012-06-29 13:36:01 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2012-06-29 13:36:01 +0200 |
| commit | 66ef5b0d48006263e2ae8eec29fd8900d6708af4 (patch) | |
| tree | e59402376e17ec2bcafbd8ff085307b066cdf7c4 /plugin/semisync/semisync.cc | |
| parent | 4661d95433b2b6f4c7f25facd2a45db23329dcba (diff) | |
| parent | 1ede2dd8146254951493081f2297b0832fdd4d13 (diff) | |
| download | mariadb-git-66ef5b0d48006263e2ae8eec29fd8900d6708af4.tar.gz | |
Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING)
Manual merge from mysql-5.1 to mysql-5.5
Diffstat (limited to 'plugin/semisync/semisync.cc')
| -rw-r--r-- | plugin/semisync/semisync.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugin/semisync/semisync.cc b/plugin/semisync/semisync.cc index 83c7791c14b..022773eed0a 100644 --- a/plugin/semisync/semisync.cc +++ b/plugin/semisync/semisync.cc @@ -26,5 +26,5 @@ const unsigned long Trace::kTraceDetail = 0x0010; const unsigned long Trace::kTraceNetWait = 0x0020; const unsigned long Trace::kTraceFunction = 0x0040; -const char ReplSemiSyncBase::kSyncHeader[2] = +const unsigned char ReplSemiSyncBase::kSyncHeader[2] = {ReplSemiSyncBase::kPacketMagicNum, 0}; |