diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-10-07 15:44:31 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-10-07 15:44:31 +0300 |
| commit | c7fd510a4191eb85890dddc235852f3b8a98362d (patch) | |
| tree | 1d9214ae1674384fb38bf9c07e2776c1206842ee /mysql-test/mysql-test-run.sh | |
| parent | bc4a57f01ace40255de2f8d7307254fd1d1d5bfa (diff) | |
| download | mariadb-git-c7fd510a4191eb85890dddc235852f3b8a98362d.tar.gz | |
Simple cleanups
client/mysqlbinlog.cc:
Add default handling to mysqlbinlog
mysql-test/mysql-test-run.sh:
Cleanup of mysqldump/mysqlbinlog argument handling
scripts/Makefile.am:
Remove duplicate
scripts/mysql_install_db.sh:
Change -eq to =
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 577f396440c..6cba5eecddd 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -429,14 +429,14 @@ if [ x$SOURCE_DIST = x1 ] ; then MYSQL_TEST="$BASEDIR/client/mysqltest" fi if [ -f "$BASEDIR/client/.libs/mysqldump" ] ; then - MYSQL_DUMP="$BASEDIR/client/.libs/mysqldump --no-defaults -uroot --socket=$MASTER_MYSOCK" + MYSQL_DUMP="$BASEDIR/client/.libs/mysqldump" else - MYSQL_DUMP="$BASEDIR/client/mysqldump --no-defaults -uroot --socket=$MASTER_MYSOCK" + MYSQL_DUMP="$BASEDIR/client/mysqldump" fi if [ -f "$BASEDIR/client/.libs/mysqlbinlog" ] ; then - MYSQL_BINLOG="$BASEDIR/client/.libs/mysqlbinlog --local-load=$MYSQL_TMP_DIR" + MYSQL_BINLOG="$BASEDIR/client/.libs/mysqlbinlog" else - MYSQL_BINLOG="$BASEDIR/client/mysqlbinlog --local-load=$MYSQL_TMP_DIR" + MYSQL_BINLOG="$BASEDIR/client/mysqlbinlog" fi if [ -n "$STRACE_CLIENT" ]; then MYSQL_TEST="strace -o $MYSQL_TEST_DIR/var/log/mysqltest.strace $MYSQL_TEST" @@ -459,8 +459,8 @@ else MYSQLD="$VALGRIND $BASEDIR/bin/mysqld" fi MYSQL_TEST="$BASEDIR/bin/mysqltest" - MYSQL_DUMP="$BASEDIR/bin/mysqldump --no-defaults -uroot --socket=$MASTER_MYSOCK" - MYSQL_BINLOG="$BASEDIR/bin/mysqlbinlog --local-load=$MYSQL_TMP_DIR" + MYSQL_DUMP="$BASEDIR/bin/mysqldump" + MYSQL_BINLOG="$BASEDIR/bin/mysqlbinlog" MYSQLADMIN="$BASEDIR/bin/mysqladmin" WAIT_PID="$BASEDIR/bin/mysql_waitpid" MYSQL_MANAGER="$BASEDIR/bin/mysqlmanager" @@ -478,6 +478,8 @@ else fi fi +MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK" +MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR" export MYSQL_DUMP export MYSQL_BINLOG |