@@ -32,8 +32,11 @@ while [ $# -gt 0 ]; do
3232 --rollback-xa) ROLLBACK_XA=1 ;;
3333 --force-non-empty-directories) FORCE_NON_EMPTY=1 ;;
3434
35- --innodb-* ) INNODB_OPTS=" $INNODB_OPTS $1 " ;;
36- --tmpdir=* |--log-innodb-page-corruption) MYSQLD_EXTRA=" $MYSQLD_EXTRA $1 " ;;
35+ --innodb|--innodb=* |--innodb-* |--innodb_* |--skip-innodb-* |--skip_innodb_* )
36+ INNODB_OPTS=" $INNODB_OPTS $1 " ;;
37+ --tmpdir=* ) MYSQLD_EXTRA=" $MYSQLD_EXTRA $1 " ;;
38+ -t) MYSQLD_EXTRA=" $MYSQLD_EXTRA --tmpdir=$2 " ; shift ;;
39+ -t* ) MYSQLD_EXTRA=" $MYSQLD_EXTRA --tmpdir=${1# -t} " ;;
3740 --incremental-basedir=* |--incremental-dir=* )
3841 die " incremental backup/prepare is not supported" ;;
3942 --apply-log-only)
@@ -43,20 +46,30 @@ while [ $# -gt 0 ]; do
4346 --stream|--stream=* ) die " --stream is not supported" ;;
4447 --compress|--compress=* |--compress-threads=* ) die " --compress is not supported" ;;
4548 --encrypt|--encrypt=* ) die " --encrypt is not supported" ;;
49+ --innobackupex) die " innobackupex mode is not supported" ;;
4650
47- --user=* |--password=* |--host=* |--port=* |--socket=* |--defaults-file=* |--defaults-extra-file=* )
51+ --user=* |--password=* |--host=* |--port=* |--socket=* |\
52+ --defaults-file=* |--defaults-extra-file=* |--defaults-group=* |\
53+ --secure-auth|--skip-secure-auth|--ssl|--ssl-verify-server-cert|\
54+ --ssl-ca=* |--ssl-capath=* |--ssl-cert=* |--ssl-cipher=* |\
55+ --ssl-crl=* |--ssl-crlpath=* |--ssl-key=* |--tls-version=* )
4856 MARIADB_OPTS=" $MARIADB_OPTS $1 " ;;
49- -u|-p|-h|-P|-S )
57+ -p )
5058 if [ -n " ${2-} " ] && case $2 in -* ) false ;; * ) true ;; esac ; then
51- MARIADB_OPTS=" $MARIADB_OPTS $1 $2 "
52- shift
59+ MARIADB_OPTS=" $MARIADB_OPTS -p$2 " ; shift
5360 else
54- MARIADB_OPTS=" $MARIADB_OPTS $1 "
61+ MARIADB_OPTS=" $MARIADB_OPTS -p "
5562 fi ;;
56- -u* |-p* |-h* |-P* |-S* )
57- MARIADB_OPTS=" $MARIADB_OPTS $1 " ;;
63+ -u|-P|-S) MARIADB_OPTS=" $MARIADB_OPTS $1 $2 " ; shift ;;
64+ -H) MARIADB_OPTS=" $MARIADB_OPTS --host=$2 " ; shift ;;
65+ -p* |-u* |-P* |-S* ) MARIADB_OPTS=" $MARIADB_OPTS $1 " ;;
66+ -H* ) MARIADB_OPTS=" $MARIADB_OPTS --host=${1# -H} " ;;
67+
68+ -h) DATADIR=$2 ; shift ;;
69+ -h* ) DATADIR=${1# -h} ;;
5870
59- --throttle=* |--no-lock|--safe-slave-backup) ;; # BACKUP SERVER's job
71+ # Everything else is accepted and ignored:
72+ * ) ;;
6073 esac
6174 shift
6275done
0 commit comments