diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-11-08 22:27:55 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-11-08 22:27:55 -0700 |
| commit | 1c809563c2ba3576e4584eda06125bf8a15850ee (patch) | |
| tree | becb201de4801df50deca53f574595aa10ed70b3 /mysql-test/mysql-test-run.sh | |
| parent | 91fb1d23770503d29744fc0c973065decd1bf0a1 (diff) | |
| download | mariadb-git-1c809563c2ba3576e4584eda06125bf8a15850ee.tar.gz | |
fixed memory leak in replication
fixed bugs in new IO_CACHE code so that the old calls work
fixed shutdown bug
clean-up of mysql-test-run
include/my_sys.h:
fixes for IO_CACHE
mysql-test/mysql-test-run.sh:
fixed missing \ bug
added --skip-gdb-magic to skip Sergei's automatic mysql_parse break
do not delete the breakpoint in command - it crashes gdb sometimes
mysys/mf_iocache2.c:
rc_pos->write_pos in my_b_seek for WRITE_CACHE
sql/mysqld.cc:
fixed shutdown bug when singals DO break read introduced by the fix for
when they don't.
sql/repl_failsafe.cc:
fixed memory leak
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 61295bd5f12..af595e80244 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -177,6 +177,7 @@ 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;; @@ -654,7 +655,7 @@ start_master() --basedir=$MY_BASEDIR --init-rpl-role=master \ --port=$MASTER_MYPORT \ --exit-info=256 \ - --core + --core \ --datadir=$MASTER_MYDDIR \ --pid-file=$MASTER_MYPID \ --socket=$MASTER_MYSOCK \ @@ -694,13 +695,18 @@ start_master() "gdb -x $GDB_MASTER_INIT" $MYSQLD elif [ x$DO_GDB = x1 ] then - $CAT <<__GDB_MASTER_INIT__ > $GDB_MASTER_INIT + ( echo set args $master_args; + if [ -z "$SKIP_GDB_MAGIC" ] ; + then + cat <<EOF b mysql_parse commands 1 -dele 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 end -r $master_args -__GDB_MASTER_INIT__ +r +EOF + fi ) > $GDB_MASTER_INIT manager_launch master $XTERM -display $DISPLAY \ -title "Master" -e gdb -x $GDB_MASTER_INIT $MYSQLD else @@ -982,7 +988,7 @@ run_testcase () fi fi cd $MYSQL_TEST_DIR - + if [ -f $tf ] ; then $RM -f r/$tname.*reject mysql_test_args="-R r/$tname.result $EXTRA_MYSQL_TEST_OPT" |