MDEV-18356 Renamed backup-encrypted option introduced in 7158edc

Rename it because it caused parser warning whenever --backup was used.
MariaDB · Jan 23, 2019 · 5c159c9 · 5c159c9
1 parent 9f4d4f4
commit 5c159c9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/extra/mariabackup/fil_cur.cc b/extra/mariabackup/fil_cur.cc
@@ -322,7 +322,7 @@ static bool page_is_corrupted(const byte *page, ulint page_no,
 	page_no first. */
 	if (page_no
 	    && mach_read_from_4(page + FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION)
-	    && (opt_backup_encrypted
+	    && (opt_encrypted_backup
 		|| (space->crypt_data
 		    && space->crypt_data->type != CRYPT_SCHEME_UNENCRYPTED))) {
 

diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
@@ -201,7 +201,7 @@ static char*	log_ignored_opt;
 extern my_bool opt_use_ssl;
 my_bool opt_ssl_verify_server_cert;
 my_bool opt_extended_validation;
-my_bool opt_backup_encrypted;
+my_bool opt_encrypted_backup;
 
 /* === metadata of backup === */
 #define XTRABACKUP_METADATA_FILENAME "xtrabackup_checkpoints"
@@ -762,7 +762,7 @@ enum options_xtrabackup
   OPT_XTRA_DATABASES_FILE,
   OPT_XTRA_PARALLEL,
   OPT_XTRA_EXTENDED_VALIDATION,
-  OPT_XTRA_BACKUP_ENCRYPTED,
+  OPT_XTRA_ENCRYPTED_BACKUP,
   OPT_XTRA_STREAM,
   OPT_XTRA_COMPRESS,
   OPT_XTRA_COMPRESS_THREADS,
@@ -1231,12 +1231,12 @@ struct my_option xb_server_options[] =
    (G_PTR*)&opt_extended_validation,
    0, GET_BOOL, NO_ARG, FALSE, 0, 0, 0, 0, 0},
 
-  {"backup_encrypted", OPT_XTRA_BACKUP_ENCRYPTED,
+  {"encrypted_backup", OPT_XTRA_ENCRYPTED_BACKUP,
    "In --backup, assume that nonzero key_version implies that the page"
-   " is encrypted. Use --backup --skip-backup-encrypted to allow"
+   " is encrypted. Use --backup --skip-encrypted-backup to allow"
    " copying unencrypted that were originally created before MySQL 5.1.48.",
-   (G_PTR*)&opt_backup_encrypted,
-   (G_PTR*)&opt_backup_encrypted,
+   (G_PTR*)&opt_encrypted_backup,
+   (G_PTR*)&opt_encrypted_backup,
    0, GET_BOOL, NO_ARG, TRUE, 0, 0, 0, 0, 0},
 
    {"log", OPT_LOG, "Ignored option for MySQL option compatibility",

diff --git a/extra/mariabackup/xtrabackup.h b/extra/mariabackup/xtrabackup.h
@@ -108,7 +108,7 @@ extern my_bool		opt_no_backup_locks;
 extern my_bool		opt_decompress;
 extern my_bool		opt_remove_original;
 extern my_bool		opt_extended_validation;
-extern my_bool		opt_backup_encrypted;
+extern my_bool		opt_encrypted_backup;
 extern my_bool		opt_lock_ddl_per_table;
 
 extern char		*opt_incremental_history_name;