diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-19 12:31:56 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-19 12:31:56 +0300 |
commit | ef44ec4afaa70521789dbb7886a0a21da64a569e (patch) | |
tree | 1862c6cd81a3a39780ef1f31b417dcdba2ba7bd4 /sql/log_event.cc | |
parent | 7e4ea4189ae993460a31431816e36db78fa63a67 (diff) | |
parent | d9dcb8ba029709cf447efd9237f6ad4834f0783a (diff) | |
download | mariadb-git-ef44ec4afaa70521789dbb7886a0a21da64a569e.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/log_event.cc')
-rw-r--r-- | sql/log_event.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index a4acb9e5701..ce4d57329c7 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -298,7 +298,7 @@ class Write_on_release_cache public: enum flag { - FLUSH_F + FLUSH_F= 1 }; typedef unsigned short flag_set; |