diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-03-10 11:22:37 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-03-10 11:22:37 +0200 |
| commit | 68ae365395c78eba74b4db66fb0989e76d221d0d (patch) | |
| tree | caaf93f4311641760c5a58ab8099d7eab15c0d79 /mysql-test/mysql-test-run.sh | |
| parent | 374ea106f5098e4a6ee79f217bf799d181d20a25 (diff) | |
| download | mariadb-git-68ae365395c78eba74b4db66fb0989e76d221d0d.tar.gz | |
Don't allow BACKUP TABLE to overwrite files
Fixed memory leak when replication restarts in debug mode
include/my_sys.h:
Added option to not overwrite files to my_copy()
mysql-test/mysql-test-run.sh:
Fixed --ddd option
Fixed that mysqld is restarted if there is a testname-master.sh file
mysql-test/r/backup.result:
Update for security fix in BACKUP TABLE
mysql-test/t/backup.test:
Update for security fix in BACKUP TABLE
mysys/my_copy.c:
Added option to not overwrite files to my_copy()
sql/ha_myisam.cc:
Don't allow BACKUP TABLE to overwrite files
sql/slave.cc:
Fixed problem with --debug output from 'handle_slave'
Fixed memory leak when replication restarts in debug mode
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 8b1c8ff1b44..e6a52ba8756 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -604,7 +604,7 @@ start_slave() $EXTRA_SLAVE_OPT $EXTRA_SLAVE_MYSQLD_OPT" if [ x$DO_DDD = x1 ] then - $ECHO "set args $master_args" > $GDB_SLAVE_INIT + $ECHO "set args $slave_args" > $GDB_SLAVE_INIT ddd --debugger "gdb -x $GDB_SLAVE_INIT" $SLAVE_MYSQLD & prompt_user "Hit enter to continue after you've started the slave" elif [ x$DO_GDB = x1 ] @@ -746,7 +746,7 @@ run_testcase () stop_master start_master else - if [ ! -z "$EXTRA_MASTER_OPT" ] || [ x$MASTER_RUNNING != x1 ] ; + if [ ! -z "$EXTRA_MASTER_OPT" ] || [ x$MASTER_RUNNING != x1 ] || [ -f $master_init_script ] then EXTRA_MASTER_OPT="" stop_master |