Skip to content

Commit 50b6964

Browse files
committed
MDEV-29244 mariabackup --help output still referst to innobackupex
Changing the tool name in the "mariadb-backup --help" output from "innobackupex" to "mariadb-backup".
1 parent 49ee18e commit 50b6964

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

extra/mariabackup/xtrabackup.cc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,7 +1242,7 @@ struct my_option xb_client_options[]= {
12421242

12431243
{"rsync", OPT_RSYNC,
12441244
"Uses the rsync utility to optimize local file "
1245-
"transfers. When this option is specified, innobackupex uses rsync "
1245+
"transfers. When this option is specified, " XB_TOOL_NAME " uses rsync "
12461246
"to copy all non-InnoDB files instead of spawning a separate cp for "
12471247
"each file, which can be much faster for servers with a large number "
12481248
"of databases or tables. This option cannot be used together with "
@@ -1350,7 +1350,7 @@ struct my_option xb_client_options[]= {
13501350

13511351
{"ftwrl-wait-query-type", OPT_LOCK_WAIT_QUERY_TYPE,
13521352
"This option specifies which types of queries are allowed to complete "
1353-
"before innobackupex will issue the global lock. Default is all.",
1353+
"before " XB_TOOL_NAME " will issue the global lock. Default is all.",
13541354
(uchar *) &opt_lock_wait_query_type, (uchar *) &opt_lock_wait_query_type,
13551355
&query_type_typelib, GET_ENUM, REQUIRED_ARG, QUERY_TYPE_ALL, 0, 0, 0, 0,
13561356
0},
@@ -1370,26 +1370,26 @@ struct my_option xb_client_options[]= {
13701370
NULL, NULL, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
13711371

13721372
{"kill-long-queries-timeout", OPT_KILL_LONG_QUERIES_TIMEOUT,
1373-
"This option specifies the number of seconds innobackupex waits "
1373+
"This option specifies the number of seconds " XB_TOOL_NAME " waits "
13741374
"between starting FLUSH TABLES WITH READ LOCK and killing those "
13751375
"queries that block it. Default is 0 seconds, which means "
1376-
"innobackupex will not attempt to kill any queries.",
1376+
XB_TOOL_NAME " will not attempt to kill any queries.",
13771377
(uchar *) &opt_kill_long_queries_timeout,
13781378
(uchar *) &opt_kill_long_queries_timeout, 0, GET_UINT, REQUIRED_ARG, 0, 0,
13791379
0, 0, 0, 0},
13801380

13811381
{"ftwrl-wait-timeout", OPT_LOCK_WAIT_TIMEOUT,
1382-
"This option specifies time in seconds that innobackupex should wait "
1382+
"This option specifies time in seconds that " XB_TOOL_NAME " should wait "
13831383
"for queries that would block FTWRL before running it. If there are "
1384-
"still such queries when the timeout expires, innobackupex terminates "
1385-
"with an error. Default is 0, in which case innobackupex does not "
1384+
"still such queries when the timeout expires, " XB_TOOL_NAME " terminates "
1385+
"with an error. Default is 0, in which case " XB_TOOL_NAME " does not "
13861386
"wait for queries to complete and starts FTWRL immediately.",
13871387
(uchar *) &opt_lock_wait_timeout, (uchar *) &opt_lock_wait_timeout, 0,
13881388
GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
13891389

13901390
{"ftwrl-wait-threshold", OPT_LOCK_WAIT_THRESHOLD,
13911391
"This option specifies the query run time threshold which is used by "
1392-
"innobackupex to detect long-running queries with a non-zero value "
1392+
XB_TOOL_NAME " to detect long-running queries with a non-zero value "
13931393
"of --ftwrl-wait-timeout. FTWRL is not started until such "
13941394
"long-running queries exist. This option has no effect if "
13951395
"--ftwrl-wait-timeout is 0. Default value is 60 seconds.",

extra/mariabackup/xtrabackup.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
2727
#include "changed_page_bitmap.h"
2828
#include <set>
2929

30+
#define XB_TOOL_NAME "mariadb-backup"
31+
3032
struct xb_delta_info_t
3133
{
3234
xb_delta_info_t(ulint page_size, ulint zip_size, ulint space_id)

0 commit comments

Comments
 (0)