summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulius Goryavsky <julius.goryavsky@mariadb.com>2021-04-07 16:44:30 +0200
committerJulius Goryavsky <julius.goryavsky@mariadb.com>2021-04-07 16:44:30 +0200
commite14d1b35cff2d33f5bdcf578511c73b04245b372 (patch)
treef5e3f477d6e0c0123dc9ac1e3c0d8b42aadaff00
parent72da83ff99860878fc28a1f26bfd893baa153368 (diff)
downloadmariadb-git-bb-10.2-MDEV-25328-v4.tar.gz
MDEV-25328: --innodb command line option causes mariabackup to failbb-10.2-MDEV-25328-v4
This patch fixes an issue with launching mariabackup during SST (when used with Galera), when during bootstrap mariabackup receives the "--innodb" option, which is incorrectly interpreted as shortcut for "--innodb-force-recovery". This patch does not require separate test for mtr, as the problem is visible in general testing on buildbot.
-rw-r--r--extra/mariabackup/xtrabackup.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index 59551a7d044..0743c8224b0 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -6622,6 +6622,8 @@ int main(int argc, char **argv)
{
char **client_defaults, **server_defaults;
+ my_getopt_prefix_matching= 0;
+
if (get_exepath(mariabackup_exe,FN_REFLEN, argv[0]))
strncpy(mariabackup_exe,argv[0], FN_REFLEN-1);