diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-03-22 14:41:36 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-03-22 14:41:36 +0400 |
| commit | 1c60f40868f6067be81a50198e1c72df08814adf (patch) | |
| tree | d5570ecfa377236d527d3c6a1db2a6b508c5a005 /extra | |
| parent | f4484dfdbf2d78b0f357916ebd8ade024dd73c09 (diff) | |
| parent | 50a8fc52988d13a5164a1a542b9d7a85e3ecc1c1 (diff) | |
| download | mariadb-git-1c60f40868f6067be81a50198e1c72df08814adf.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into 10.3
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 7aa32083ab0..e8dee510f63 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -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 @@ -5371,8 +5371,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]; |