diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-05 01:04:08 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-05 01:04:08 +0200 |
| commit | d18a6cc33a220e056dfa1633b928ac0b1415789d (patch) | |
| tree | 1750cfa3cfd660f20d5055a78caff42a53363247 /mysql-test/mysql-test-run.sh | |
| parent | cec36f0f14b6c885aabe4eb989fb9ff4a4ae6a7c (diff) | |
| download | mariadb-git-d18a6cc33a220e056dfa1633b928ac0b1415789d.tar.gz | |
Fixes up things after merge from 3.23.44
Portability fixes.
Don't delete temporary tables on FLUSH tables.
client/client_priv.h:
Fix after merge
client/mysqldump.c:
Fix after merge
include/my_global.h:
Change CMP -> CMP_NUM because CMP was used in other places
include/violite.h:
Added missing prototype
myisam/ft_boolean_search.c:
Removed warnings
myisam/ft_nlq_search.c:
Removed warnings
myisam/mi_search.c:
CMP -> CMP_NUM
mysql-test/mysql-test-run.sh:
Write all logs to log directory
mysql-test/r/func_time.result:
Fix test results after merge
mysql-test/r/having.result:
Fix test results after merge
mysql-test/r/join.result:
Fix test results after merge
mysql-test/r/rpl000012.result:
Fix test results after merge
mysys/mf_iocache.c:
Allow multiple call to end_iocache.
sql/ha_innobase.cc:
Removed possible problem with using uninitialized variable
sql/log_event.cc:
Don't delete temporary tables on FLUSH tables.
(Needs to be fixed properly)
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index f99a594f1f1..57e5b5763f3 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -367,7 +367,7 @@ GCOV_ERR=$MYSQL_TMP_DIR/mysqld-gcov.err GPROF_DIR=$MYSQL_TMP_DIR/gprof GPROF_MASTER=$GPROF_DIR/master.gprof GPROF_SLAVE=$GPROF_DIR/slave.gprof -TIMEFILE="$MYSQL_TMP_DIR/mysqltest-time" +TIMEFILE="$MYSQL_TEST_DIR/var/log/mysqltest-time" SLAVE_MYSQLD=$MYSQLD #this can be changed later if we are doing gcov XTERM=`which xterm` @@ -545,8 +545,7 @@ abort_if_failed() start_manager() { if [ $USE_MANAGER = 0 ] ; then - echo "Manager disabled, skipping manager start. Tests requiring manager will\ - be skipped" + echo "Manager disabled, skipping manager start." return fi $ECHO "Starting MySQL Manager" |