summaryrefslogtreecommitdiff
path: root/storage/xtradb/log
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2018-01-24 20:20:11 +0200
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2018-01-24 20:20:11 +0200
commita82bb5d316d368cab7624cc3322e9a9f2e00d489 (patch)
tree2996891452d8c07111bb9b3795ca7de755176bfb /storage/xtradb/log
parent3699a4b5c07efebfd8e325ee12120573087288b6 (diff)
parentcd33250d2acf65361ee2ead625c626bfd2f51046 (diff)
downloadmariadb-git-a82bb5d316d368cab7624cc3322e9a9f2e00d489.tar.gz
Merge branch 'merge-xtradb-5.6' into 10.0
Diffstat (limited to 'storage/xtradb/log')
-rw-r--r--storage/xtradb/log/log0online.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/storage/xtradb/log/log0online.cc b/storage/xtradb/log/log0online.cc
index 1e373c8345f..1a30501f266 100644
--- a/storage/xtradb/log/log0online.cc
+++ b/storage/xtradb/log/log0online.cc
@@ -487,6 +487,9 @@ log_online_make_bitmap_name(
}
/*********************************************************************//**
+}
+
+/*********************************************************************//**
Check if an old file that has the name of a new bitmap file we are about to
create should be overwritten. */
static