mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
fixes: --gdb does not implies --manager
--manager implies --skip-gdb-magic (which was introduced to make --gdb usable w/o manager)
This commit is contained in:
@ -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
|
|||||||
--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()
|
|||||||
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
|
||||||
|
Reference in New Issue
Block a user