compiler warning

vuvova · vuvova · commit 86718fda4e53 · 2018-04-20T09:40:29.000+02:00
bad merge
diff --git a/storage/xtradb/log/log0online.cc b/storage/xtradb/log/log0online.cc
@@ -486,9 +486,6 @@ log_online_make_bitmap_name(
             bmp_file_name_stem, log_bmp_sys->out_seq_num, start_lsn);
 }
 
-/*********************************************************************//**
-}
-
 /*********************************************************************//**
 Check if an old file that has the name of a new bitmap file we are about to
 create should be overwritten.  */

Original file line number	Diff line number	Diff line change
`@@ -486,9 +486,6 @@ log_online_make_bitmap_name(`
`486`	`486`	`bmp_file_name_stem, log_bmp_sys->out_seq_num, start_lsn);`
`487`	`487`	`}`
`488`	`488`
`489`		`-/*******************************************************************//`
`490`		`-}`
`491`		`-`
`492`	`489`	`/*******************************************************************//`
`493`	`490`	`Check if an old file that has the name of a new bitmap file we are about to`
`494`	`491`	`create should be overwritten. */`