summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2000-12-12 04:34:56 +0200
committerunknown <monty@donna.mysql.com>2000-12-12 04:34:56 +0200
commit28ad76e22c799a933006e8cad31a7389e85106eb (patch)
tree3c78736b50f99b9b8ac968afb833752f201a482a /mysql-test
parent7847639270269bc6aebeed36e68ddfec0cf6c145 (diff)
downloadmariadb-git-28ad76e22c799a933006e8cad31a7389e85106eb.tar.gz
Fixed delete in tables with hidden primary key
Remove not used BDB logs on shutdown Don't give warnings for repair on slaves Fixed transaction log files Docs/manual.texi: Updated 'known bugs' include/my_sys.h: Added define for checking number of bytes left in the IO_CACHE mysql-test/mysql-test-run: Small bug fixes mysys/mf_iocache2.c: Use new define sql/filesort.cc: Temporary fix for FULLTEXT index sql/ha_berkeley.cc: Fix for delete in tables with hidden primary key Remove not used BDB logs on shutdown sql/ha_myisam.cc: Don't give warnings for repair on slaves sql/hostname.cc: Portability fix sql/log.cc: Fix transaction log files sql/log_event.h: portability fix sql/slave.cc: Don't give warnings for repair on slaves sql/sql_class.h: Cleanup sql/sql_parse.cc: Fixed typo
Diffstat (limited to 'mysql-test')
-rwxr-xr-xmysql-test/mysql-test-run16
1 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/mysql-test-run b/mysql-test/mysql-test-run
index eb39a25fbaf..111dd0b41cc 100755
--- a/mysql-test/mysql-test-run
+++ b/mysql-test/mysql-test-run
@@ -23,7 +23,7 @@ else
if [ -f ./mysql-test-run ] && [ -d ../sql ] ; then
SOURCE_DIST=1
else
- echo "If you are using binary distirubution, run me from install root as \
+ echo "If you are using binary distribution, run me from install root as \
scripts/mysql-test-run. On source distribution run me from source root as \
mysql-test/mysql-test-run or from mysql-test as ./mysql-test-run"
exit 1
@@ -100,18 +100,18 @@ fi
#++
# Program Definitions
#--
-BASENAME=`which basename`
+BASENAME=`which basename | head -1`
CAT=/bin/cat
CUT=/usr/bin/cut
ECHO=/bin/echo
-EXPR=`which expr`
+EXPR=`which expr | head -1`
FIND=/usr/bin/find
-GCOV=`which gcov`
+GCOV=`which gcov | head -1`
PRINTF=/usr/bin/printf
RM=/bin/rm
TIME=/usr/bin/time
TR=/usr/bin/tr
-XARGS=`which xargs`
+XARGS=`which xargs | head -1`
# on source dist, we pick up freshly build executables
# on binary, use what is installed
@@ -130,7 +130,7 @@ fi
SLAVE_MYSQLD=$MYSQLD #this will be changed later if we are doing gcov
-MYSQL_TEST="$MYSQL_TEST --socket=$MASTER_MYSOCK --database=$DB --user=$DBUSER --password=$DBPASSWD --silent"
+MYSQL_TEST="$MYSQL_TEST --no-defaults --socket=$MASTER_MYSOCK --database=$DB --user=$DBUSER --password=$DBPASSWD --silent"
GDB_MASTER_INIT=/tmp/gdbinit.master
GDB_SLAVE_INIT=/tmp/gdbinit.slave
@@ -358,7 +358,7 @@ stop_slave ()
{
if [ x$SLAVE_RUNNING = x1 ]
then
- $MYSQLADMIN --socket=$SLAVE_MYSOCK -u root shutdown
+ $MYSQLADMIN --no-defaults --socket=$SLAVE_MYSOCK -u root shutdown
SLAVE_RUNNING=0
fi
}
@@ -367,7 +367,7 @@ stop_master ()
{
if [ x$MASTER_RUNNING = x1 ]
then
- $MYSQLADMIN --socket=$MASTER_MYSOCK -u root shutdown
+ $MYSQLADMIN --no-defaults --socket=$MASTER_MYSOCK -u root shutdown
MASTER_RUNNING=0
fi
}