summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorserg@serg.mysql.com <>2001-11-20 17:59:57 +0100
committerserg@serg.mysql.com <>2001-11-20 17:59:57 +0100
commit4aa8f0adc1bc9fc7a495693e2475dd55aaf8a0d5 (patch)
tree21dd265f2d8e9a22b4e954967c8b408f656c5ee9 /mysql-test
parente30fc1ac17caa82c88b13b331ff3113d76fa8199 (diff)
downloadmariadb-git-4aa8f0adc1bc9fc7a495693e2475dd55aaf8a0d5.tar.gz
fixes: --gdb does not implies --manager
--manager implies --skip-gdb-magic (which was introduced to make --gdb usable w/o manager)
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/mysql-test-run.sh8
1 files changed, 2 insertions, 6 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 53035896077..871ba10b721 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -185,7 +185,6 @@ while test $# -gt 0; do
--skip-rpl) NO_SLAVE=1 ;;
--skip-test=*) SKIP_TEST=`$ECHO "$1" | $SED -e "s;--skip-test=;;"`;;
--do-test=*) DO_TEST=`$ECHO "$1" | $SED -e "s;--do-test=;;"`;;
- --skip-gdb-magic) SKIP_GDB_MAGIC=1 ;;
--wait-timeout=*)
START_WAIT_TIMEOUT=`$ECHO "$1" | $SED -e "s;--wait-timeout=;;"`
STOP_WAIT_TIMEOUT=$START_WAIT_TIMEOUT;;
@@ -222,7 +221,6 @@ while test $# -gt 0; do
--gdb )
START_WAIT_TIMEOUT=300
STOP_WAIT_TIMEOUT=300
- USE_MANAGER=1
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"
fi
@@ -705,13 +703,11 @@ start_master()
elif [ x$DO_GDB = x1 ]
then
( echo set args $master_args;
- if [ -z "$SKIP_GDB_MAGIC" ] ;
- then
+ if [ $USE_MANAGER = 0 ] ; then
cat <<EOF
b mysql_parse
commands 1
-echo If you do not want to break here anymore, type dele 1\n
-echo If you not want to break at all, use --skip-gdb-magic\n
+disa 1
end
r
EOF