1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-6095 replicate- filters for slaves with a connection name that contain an underscore are ignored

Browse Source 
Revert revision-id: guilhem@mysql.com-20091118203617-3jfudef971r7bf2y
Implement a non-destructive fix instead.
This commit is contained in:
Sergei Golubchik 2014-05-05 14:18:35 +02:00
parent a5beb350ae
commit 9c9aa62ddc
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
scripts/mysqld_safe.sh
View File

@ -201,38 +201,32 @@ parse_arguments() {
fi fi
for arg do for arg do
# the parameter after "=", or the whole $arg if no match val=`echo "$arg" | sed -e "s;--[^=]*=;;"`
val=`echo "$arg" | sed -e 's;^--[^=]*=;;'`
# what's before "=", or the whole $arg if no match
optname=`echo "$arg" | sed -e 's/^\(--[^=]*\)=.*$/\1/'`
# replace "_" by "-" ; mysqld_safe must accept "_" like mysqld does.
optname_subst=`echo "$optname" | sed 's/_/-/g'`
arg=`echo $arg | sed "s/^$optname/$optname_subst/"`
case "$arg" in case "$arg" in
--crash-script=*) CRASH_SCRIPT="$val" ;; --crash[-_]script=*) CRASH_SCRIPT="$val" ;;
# these get passed explicitly to mysqld # these get passed explicitly to mysqld
--basedir=*) MY_BASEDIR_VERSION="$val" ;; --basedir=*) MY_BASEDIR_VERSION="$val" ;;
--datadir=*|--data=*) DATADIR="$val" ;; --datadir=*|--data=*) DATADIR="$val" ;;
--pid-file=*) pid_file="$val" ;; --pid[-_]file=*) pid_file="$val" ;;
--plugin-dir=*) PLUGIN_DIR="$val" ;; --plugin[-_]dir=*) PLUGIN_DIR="$val" ;;
--user=*) user="$val"; SET_USER=1 ;; --user=*) user="$val"; SET_USER=1 ;;
--log-basename=*|--hostname=*|--loose-log-basename=*) --log[-_]basename=*|--hostname=*|--loose[-_]log[-_]basename=*)
pid_file="$val.pid"; pid_file="$val.pid";
err_log="$val.err"; err_log="$val.err";
;; ;;
# these might have been set in a [mysqld_safe] section of my.cnf # these might have been set in a [mysqld_safe] section of my.cnf
# they are added to mysqld command line to override settings from my.cnf # they are added to mysqld command line to override settings from my.cnf
--log-error=*) err_log="$val" ;; --log[-_]error=*) err_log="$val" ;;
--port=*) mysql_tcp_port="$val" ;; --port=*) mysql_tcp_port="$val" ;;
--socket=*) mysql_unix_port="$val" ;; --socket=*) mysql_unix_port="$val" ;;
# mysqld_safe-specific options - must be set in my.cnf ([mysqld_safe])! # mysqld_safe-specific options - must be set in my.cnf ([mysqld_safe])!
--core-file-size=*) core_file_size="$val" ;; --core[-_]file[-_]size=*) core_file_size="$val" ;;
--ledir=*) ledir="$val" ;; --ledir=*) ledir="$val" ;;
--malloc-lib=*) set_malloc_lib "$val" ;; --malloc[-_]lib=*) set_malloc_lib "$val" ;;
--mysqld=*) MYSQLD="$val" ;; --mysqld=*) MYSQLD="$val" ;;
--mysqld-version=*) --mysqld[-_]version=*)
if test -n "$val" if test -n "$val"
then then
MYSQLD="mysqld-$val" MYSQLD="mysqld-$val"
@ -242,16 +236,15 @@ parse_arguments() {
fi fi
;; ;;
--nice=*) niceness="$val" ;; --nice=*) niceness="$val" ;;
--nowatch|--no-watch|--no-auto-restart) nowatch=1 ;; --nowatch|--no[-_]watch|--no[-_]auto[-_]restart) nowatch=1 ;;
--open-files-limit=*) open_files="$val" ;; --open[-_]files[-_]limit=*) open_files="$val" ;;
--open_files_limit=*) open_files="$val" ;; --skip[-_]kill[-_]mysqld*) KILL_MYSQLD=0 ;;
--skip-kill-mysqld*) KILL_MYSQLD=0 ;;
--syslog) want_syslog=1 ;; --syslog) want_syslog=1 ;;
--skip-syslog) want_syslog=0 ;; --skip[-_]syslog) want_syslog=0 ;;
--syslog-tag=*) syslog_tag="$val" ;; --syslog[-_]tag=*) syslog_tag="$val" ;;
--timezone=*) TZ="$val"; export TZ; ;; --timezone=*) TZ="$val"; export TZ; ;;
--flush-caches) flush_caches=1 ;; --flush[-_]caches) flush_caches=1 ;;
--numa-interleave) numa_interleave=1 ;; --numa[-_]interleave) numa_interleave=1 ;;
--help) usage ;; --help) usage ;;