database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge work:/home/bk/mysql-4.0

Browse Source 
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0


mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/t/join.test:
  Auto merged
This commit is contained in:
unknown
2001-10-13 09:29:32 -06:00
parent 0c2d19b5b5 5c1dbfe6a7
commit b28bfc7a26
15 changed files with 188 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/mysql-test-run.sh
View File

@ -233,6 +233,9 @@ while test $# -gt 0; do
EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT $1"
EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT $1"
;;
--strace-client )
STRACE_CLIENT=1
;;
--debug)
EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT \
--debug=d:t:i:O,$MYSQL_TEST_DIR/var/log/master.trace"
@ -298,6 +301,10 @@ if [ x$SOURCE_DIST = x1 ] ; then
else
MYSQL_TEST="$BASEDIR/client/mysqltest"
fi
if [ -n "$STRACE_CLIENT" ]; then
MYSQL_TEST="strace -o $MYSQL_TEST_DIR/var/log/mysqltest.strace $MYSQL_TEST"
fi
MYSQLADMIN="$BASEDIR/client/mysqladmin"
MYSQL_MANAGER_CLIENT="$BASEDIR/client/mysqlmanagerc"
MYSQL_MANAGER="$BASEDIR/tools/mysqlmanager"
@ -667,8 +674,8 @@ start_master()
elif [ x$DO_GDB = x1 ]
then
$ECHO "set args $master_args" > $GDB_MASTER_INIT
manager_launch master $XTERM -display :0 -title "Master" -e gdb -x \
$GDB_MASTER_INIT $MYSQLD
manager_launch master $XTERM -display $DISPLAY \
-title "Master" -e gdb -x $GDB_MASTER_INIT $MYSQLD
else
manager_launch master $MYSQLD $master_args
fi