summaryrefslogtreecommitdiff
path: root/sql/log_event.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-07-18 13:10:09 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-07-18 13:10:09 +0300
commit69628551858825bebc3f1653882920e4f6555cbb (patch)
treed744f4354c81c93ac76bf6530eefde17eb093177 /sql/log_event.cc
parent26b594e4110b4f7e6f2bcfbdb4c87aef65652bc0 (diff)
parent10ebdb7f1d7a3f6aa6a91b40a9d90f482da08e58 (diff)
downloadmariadb-git-69628551858825bebc3f1653882920e4f6555cbb.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'sql/log_event.cc')
-rw-r--r--sql/log_event.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 01f31aceff7..0e0d69b515c 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -296,7 +296,7 @@ class Write_on_release_cache
public:
enum flag
{
- FLUSH_F
+ FLUSH_F= 1
};
typedef unsigned short flag_set;