Commit 4aa8f0ad authored by serg@serg.mysql.com's avatar serg@serg.mysql.com

fixes: --gdb does not implies --manager

--manager implies --skip-gdb-magic
(which was introduced to make --gdb usable w/o manager)
parent e30fc1ac
...@@ -185,7 +185,6 @@ while test $# -gt 0; do ...@@ -185,7 +185,6 @@ while test $# -gt 0; do
--skip-rpl) NO_SLAVE=1 ;; --skip-rpl) NO_SLAVE=1 ;;
--skip-test=*) SKIP_TEST=`$ECHO "$1" | $SED -e "s;--skip-test=;;"`;; --skip-test=*) SKIP_TEST=`$ECHO "$1" | $SED -e "s;--skip-test=;;"`;;
--do-test=*) DO_TEST=`$ECHO "$1" | $SED -e "s;--do-test=;;"`;; --do-test=*) DO_TEST=`$ECHO "$1" | $SED -e "s;--do-test=;;"`;;
--skip-gdb-magic) SKIP_GDB_MAGIC=1 ;;
--wait-timeout=*) --wait-timeout=*)
START_WAIT_TIMEOUT=`$ECHO "$1" | $SED -e "s;--wait-timeout=;;"` START_WAIT_TIMEOUT=`$ECHO "$1" | $SED -e "s;--wait-timeout=;;"`
STOP_WAIT_TIMEOUT=$START_WAIT_TIMEOUT;; STOP_WAIT_TIMEOUT=$START_WAIT_TIMEOUT;;
...@@ -222,7 +221,6 @@ while test $# -gt 0; do ...@@ -222,7 +221,6 @@ while test $# -gt 0; do
--gdb ) --gdb )
START_WAIT_TIMEOUT=300 START_WAIT_TIMEOUT=300
STOP_WAIT_TIMEOUT=300 STOP_WAIT_TIMEOUT=300
USE_MANAGER=1
if [ x$BINARY_DIST = x1 ] ; then if [ x$BINARY_DIST = x1 ] ; then
$ECHO "Note: you will get more meaningful output on a source distribution compiled with debugging option when running tests with --gdb option" $ECHO "Note: you will get more meaningful output on a source distribution compiled with debugging option when running tests with --gdb option"
fi fi
...@@ -705,13 +703,11 @@ start_master() ...@@ -705,13 +703,11 @@ start_master()
elif [ x$DO_GDB = x1 ] elif [ x$DO_GDB = x1 ]
then then
( echo set args $master_args; ( echo set args $master_args;
if [ -z "$SKIP_GDB_MAGIC" ] ; if [ $USE_MANAGER = 0 ] ; then
then
cat <<EOF cat <<EOF
b mysql_parse b mysql_parse
commands 1 commands 1
echo If you do not want to break here anymore, type dele 1\n disa 1
echo If you not want to break at all, use --skip-gdb-magic\n
end end
r r
EOF EOF
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment