Preliminary fix for issue #53

Percona-QA · Dec 27, 2016 · 0646638 · 0646638
1 parent fd4ef14
commit 0646638
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/include/xtrabackup_incremental_backup.sh b/include/xtrabackup_incremental_backup.sh
@@ -118,12 +118,16 @@ function backup()
 
 	local backup_command="--defaults-file=${S_DEFAULTSFILE[$PTB_OPT_server_id]} --no-version-check"
 	local backup_ssl="--ssl=1 --ssl-ca=${S_SSL_CA_CLIENT[$PTB_OPT_server_id]} --ssl-cert=${S_SSL_CERT_CLIENT[$PTB_OPT_server_id]} --ssl-key=${S_SSL_KEY_CLIENT[$PTB_OPT_server_id]}"
-	local backup_keyring_plugin="--keyring-file-data=${S_KEYRING_FILE_DATA[$PTB_OPT_server_id]}"
+
 	backup_command="$backup_command --no-timestamp"
 	backup_command="$backup_command --tmpdir=$PTB_OPT_vardir"
 	backup_command="$backup_command $xb_backup_command_options"
 	backup_command="$backup_command $backup_ssl"
+	if [[ $(${S_BINDIR[$PTB_OPT_server_id]}/bin/mysqld --version | grep -oe '5\.[567]' | head -n1) == "5.7" ]]; then
+	local backup_keyring_plugin="--keyring-file-data=${S_KEYRING_FILE_DATA[$PTB_OPT_server_id]}"
 	backup_command="$backup_command $backup_keyring_plugin"
+	fi
+
 
 	ptb_report_info "$rpt_prefix - Beginning backup test with basic options ${backup_command}"
 

diff --git a/include/xtrabackup_restore_and_validate.sh b/include/xtrabackup_restore_and_validate.sh
@@ -67,9 +67,11 @@ function restore()
 	fi
 
 	local restore_base_command="--defaults-file=${S_DEFAULTSFILE[${PTB_OPT_server_id}]} --no-version-check"
-	local restore_keyring_plugin="--keyring-file-data=${S_KEYRING_FILE_DATA[$PTB_OPT_server_id]}"
 	restore_base_command="$restore_base_command $xb_restore_command_options"
+	if [[ $(${S_BINDIR[$PTB_OPT_server_id]}/bin/mysqld --version | grep -oe '5\.[567]' | head -n1) == "5.7" ]]; then
+	local restore_keyring_plugin="--keyring-file-data=${S_KEYRING_FILE_DATA[$PTB_OPT_server_id]}"	
 	restore_base_command="$restore_base_command $restore_keyring_plugin"
+	fi
 
 	# loop through full backups
 	local full_cycle=0