mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.1 into 10.2

Browse source
This commit is contained in:
Marko Mäkelä 2019-03-22 11:15:21 +02:00
commit 031fa8f1d2
20 changed files with 292 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

5
extra/mariabackup/xtrabackup.cc
View file

@ -4,7 +4,7 @@ MariaBackup: hot backup tool for InnoDB
Originally Created 3/3/2009 Yasufumi Kinoshita
Written by Alexey Kopytov, Aleksandr Kuzminsky, Stewart Smith, Vadim Tkachenko,
Yasufumi Kinoshita, Ignacio Nin and Baron Schwartz.
(c) 2017, 2018, MariaDB Corporation.
(c) 2017, 2019, MariaDB Corporation.
Portions written by Marko Mäkelä.
This program is free software; you can redistribute it and/or modify
@ -5419,8 +5419,7 @@ static ibool prepare_handle_del_files(const char *datadir, const char *db, const
/** Implement --prepare
@return whether the operation succeeded */
static bool
xtrabackup_prepare_func(char** argv)
static bool xtrabackup_prepare_func(char** argv)
{
char metadata_path[FN_REFLEN];