diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-05 23:04:38 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-05 23:04:38 +0300 |
| commit | 23e0e11e43f669e19713c440ce3152dd229b4613 (patch) | |
| tree | 9260753468997c0d4b3b8c78aea517507e2791eb /mysql-test | |
| parent | 795d647b24804c786b1b0390410edd1bb83af959 (diff) | |
| download | mariadb-git-23e0e11e43f669e19713c440ce3152dd229b4613.tar.gz | |
removed init_count from IO_CACHE.
Added missing mutex_unlock to slave replication code.
include/my_sys.h:
removed init_count from IO_CACHE.
General cleanup.
innobase/srv/srv0srv.c:
Initailize slots to avoid purify warnings.
Removed some compiler warnings.
mysql-test/mysql-test-run.sh:
Automatic start of slave under gdb
mysys/mf_iocache.c:
removed init_count
sql/field.cc:
Cleanup
sql/log.cc:
Cleanup
added open_count variable.
sql/log_event.cc:
cleanup
use is_prefix instead of memcmp()
sql/repl_failsafe.cc:
cleanup
sql/slave.cc:
cleanup
use MYSQL_LOG->open_count instead of IO_CACHE->init_count
Added missing mutex_unlock()
sql/slave.h:
cleanup
sql/sql_class.h:
cleanup
Added open_count to MYSQL_LOGL
sql/sql_parse.cc:
removed compiler warning
sql/sql_repl.cc:
added DBUG_xxx
sql/unireg.h:
Added BIN_LOG_HEADER_SIZE
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 7ae89c96169..66bc7f5069b 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -675,9 +675,9 @@ manager_launch() ident=$1 shift if [ $USE_MANAGER = 0 ] ; then - $@ >$CUR_MYERR 2>&1 & - sleep 2 #hack - return + $@ >$CUR_MYERR 2>&1 & + sleep 2 #hack + return fi $MYSQL_MANAGER_CLIENT $MANAGER_QUIET_OPT --user=$MYSQL_MANAGER_USER \ --password=$MYSQL_MANAGER_PW --port=$MYSQL_MANAGER_PORT <<EOF @@ -687,7 +687,7 @@ set_exec_stderr $ident $CUR_MYERR set_exec_con $ident root localhost $CUR_MYSOCK start_exec $ident $START_WAIT_TIMEOUT EOF - abort_if_failed "Could not execute manager command" + abort_if_failed "Could not execute manager command" } manager_term() @@ -887,13 +887,23 @@ start_slave() "gdb -x $GDB_SLAVE_INIT" $SLAVE_MYSQLD elif [ x$DO_GDB = x1 ] then - $ECHO "set args $slave_args" > $GDB_SLAVE_INIT if [ x$MANUAL_GDB = x1 ] then + $ECHO "set args $slave_args" > $GDB_SLAVE_INIT echo "To start gdb for the slave, type in another window:" echo "cd $CWD ; gdb -x $GDB_SLAVE_INIT $SLAVE_MYSQLD" wait_for_slave=1500 else + ( $ECHO set args $slave_args; + if [ $USE_MANAGER = 0 ] ; then + cat <<EOF +b mysql_parse +commands 1 +disa 1 +end +r +EOF + fi ) > $GDB_SLAVE_INIT manager_launch $slave_ident $XTERM -display $DISPLAY -title "Slave" -e \ gdb -x $GDB_SLAVE_INIT $SLAVE_MYSQLD fi |