summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-04-20 09:40:29 +0200
committerSergei Golubchik <serg@mariadb.org>2018-04-20 09:40:29 +0200
commit86718fda4e5363b05aa2beaac596ec614aaa7a0f (patch)
tree9d401057d6d680e9f3c000d5cfb82af370383f1b
parent4f5dd1d40eca3cd128023a9bf636e83489430c78 (diff)
downloadmariadb-git-86718fda4e5363b05aa2beaac596ec614aaa7a0f.tar.gz
compiler warning
bad merge
-rw-r--r--storage/xtradb/log/log0online.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/storage/xtradb/log/log0online.cc b/storage/xtradb/log/log0online.cc
index 1a30501f266..1e373c8345f 100644
--- a/storage/xtradb/log/log0online.cc
+++ b/storage/xtradb/log/log0online.cc
@@ -487,9 +487,6 @@ 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