diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-08-02 10:11:41 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-08-02 10:11:41 +0200 |
| commit | 6efb5e9f5e3cd3ec811ae832a67e1878c14f0dea (patch) | |
| tree | b7c1a18b8bbc638ee12951d1d04db6d21bebcaed /extra/mariabackup/xtrabackup.cc | |
| parent | 07674e6a741a82d2e30f9798f699209a6c34dfef (diff) | |
| parent | ec8882b9ddbba2f9fc3571a1ac2ade0dabf412d9 (diff) | |
| download | mariadb-git-6efb5e9f5e3cd3ec811ae832a67e1878c14f0dea.tar.gz | |
Merge branch '10.5' into 10.6
Diffstat (limited to 'extra/mariabackup/xtrabackup.cc')
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 6e321dcb436..ff6fc6100e9 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -51,7 +51,7 @@ Street, Fifth Floor, Boston, MA 02110-1335 USA #include <my_getopt.h> #include <mysql_com.h> #include <my_default.h> -#include <mysqld.h> +#include <sql_class.h> #include <fcntl.h> #include <string.h> @@ -1207,7 +1207,7 @@ struct my_option xb_client_options[]= { "This " "option, when specified, makes --copy-back or --move-back transfer " "files to non-empty directories. Note that no existing files will be " - "overwritten. If --copy-back or --nove-back has to copy a file from " + "overwritten. If --copy-back or --move-back has to copy a file from " "the backup directory which already exists in the destination " "directory, it will still fail with an error.", (uchar *) &opt_force_non_empty_dirs, (uchar *) &opt_force_non_empty_dirs, |