diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-25 18:19:55 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-25 18:19:55 +0100 |
| commit | 00d1db7a38b17d4512a6ba5147926608aca5624d (patch) | |
| tree | c2b28145304e9eacf79fcabaeb962a20d79fec93 /scripts | |
| parent | 0485328d030f4b742dac7b667e8ed099beb9e9f2 (diff) | |
| parent | 0251232f8c3bca33b4dd15d6668105f3de9d024d (diff) | |
| download | mariadb-git-00d1db7a38b17d4512a6ba5147926608aca5624d.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | scripts/wsrep_sst_xtrabackup-v2.sh | 11 | ||||
| -rw-r--r-- | scripts/wsrep_sst_xtrabackup.sh | 5 |
3 files changed, 9 insertions, 12 deletions
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 224e34de73b..eeb44b75322 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -296,11 +296,6 @@ SET(ADD_GIS_SP_EOL "|") CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/maria_add_gis_sp.sql.in ${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp.sql ESCAPE_QUOTES @ONLY) -INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp.sql - DESTINATION ${INSTALL_BINDIR} - COMPONENT Server - ) - SET(ADD_GIS_SP_SET_DELIMITER "") SET(ADD_GIS_SP_RESET_DELIMITER "") SET(ADD_GIS_SP_EOL ";") diff --git a/scripts/wsrep_sst_xtrabackup-v2.sh b/scripts/wsrep_sst_xtrabackup-v2.sh index 2b432cb1089..4cd21d3c216 100644 --- a/scripts/wsrep_sst_xtrabackup-v2.sh +++ b/scripts/wsrep_sst_xtrabackup-v2.sh @@ -250,7 +250,11 @@ parse_cnf() { local group=$1 local var=$2 - reval=$($MY_PRINT_DEFAULTS $group | awk -F= '{if ($1 ~ /_/) { gsub(/_/,"-",$1); print $1"="$2 } else { print $0 }}' | grep -- "--$var=" | cut -d= -f2-) + # print the default settings for given group using my_print_default. + # normalize the variable names specified in cnf file (user can use _ or - for example log-bin or log_bin) + # then grep for needed variable + # finally get the variable value (if variables has been specified multiple time use the last value only) + reval=$($MY_PRINT_DEFAULTS $group | awk -F= '{if ($1 ~ /_/) { gsub(/_/,"-",$1); print $1"="$2 } else { print $0 }}' | grep -- "--$var=" | cut -d= -f2- | tail -1) if [[ -z $reval ]];then [[ -n $3 ]] && reval=$3 fi @@ -699,9 +703,8 @@ then INNOEXTRA+=" --user=$WSREP_SST_OPT_USER" fi - if [ -n "$WSREP_SST_OPT_PSWD" ]; then -# INNOEXTRA+=" --password=$WSREP_SST_OPT_PSWD" - export MYSQL_PWD="$WSREP_SST_OPT_PSWD" + if [ -n "${WSREP_SST_OPT_PSWD:-}" ]; then + INNOEXTRA+=" --password=$WSREP_SST_OPT_PSWD" else # Empty password, used for testing, debugging etc. INNOEXTRA+=" --password=" diff --git a/scripts/wsrep_sst_xtrabackup.sh b/scripts/wsrep_sst_xtrabackup.sh index 1ef3c3f3ce1..2247edec7fd 100644 --- a/scripts/wsrep_sst_xtrabackup.sh +++ b/scripts/wsrep_sst_xtrabackup.sh @@ -442,9 +442,8 @@ then INNOEXTRA+=" --user=$WSREP_SST_OPT_USER" fi - if [ -n "$WSREP_SST_OPT_PSWD" ]; then -# INNOEXTRA+=" --password=$WSREP_SST_OPT_PSWD" - export MYSQL_PWD="$WSREP_SST_OPT_PSWD" + if [ -n "${WSREP_SST_OPT_PSWD:-}" ]; then + INNOEXTRA+=" --password=$WSREP_SST_OPT_PSWD" else # Empty password, used for testing, debugging etc. INNOEXTRA+=" --password=" |