summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-10-04 21:52:41 +0300
committerunknown <monty@hundin.mysql.fi>2001-10-04 21:52:41 +0300
commitbd7b4aaa7dac716bb6d54b3d1dd355f78b68f0f2 (patch)
treece2737a2cb7f8b0c9ce7fc646f448b1fc1a1bc92 /mysql-test
parent6bede5bed1add70fb5bb442ba70fe029c4c534f7 (diff)
downloadmariadb-git-bd7b4aaa7dac716bb6d54b3d1dd355f78b68f0f2.tar.gz
New script: explain_log.sh
Portability fixes. Handle cleanup when we get an error before the message file is read. Fix bug in multi-table delete include/mysql.h: Portability fix mysql-test/mysql-test-run.sh: Don't use long names for sockets (portability fix) sql/derror.cc: Better cleanup sql/mysqld.cc: Fix that --enable-locking works. Handle case when we get an error before the message file is read sql/sql_delete.cc: Fix bug in multi-table delete sql/sql_select.cc: Fix bug in multi-table delete sql/table.h: Fix bug in multi-table delete tools/mysqlmanager.c: Portability fixes
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/mysql-test-run.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index a9044609df4..ffc07784b7a 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -236,13 +236,13 @@ done
MYRUN_DIR=$MYSQL_TEST_DIR/var/run
MASTER_MYDDIR="$MYSQL_TEST_DIR/var/master-data"
-MASTER_MYSOCK="$MYSQL_TMP_DIR/mysql-master.sock"
+MASTER_MYSOCK="$MYSQL_TMP_DIR/master.sock"
MASTER_MYPID="$MYRUN_DIR/mysqld.pid"
MASTER_MYLOG="$MYSQL_TEST_DIR/var/log/mysqld.log"
MASTER_MYERR="$MYSQL_TEST_DIR/var/log/mysqld.err"
SLAVE_MYDDIR="$MYSQL_TEST_DIR/var/slave-data"
-SLAVE_MYSOCK="$MYSQL_TMP_DIR/mysql-slave.sock"
+SLAVE_MYSOCK="$MYSQL_TMP_DIR/slave.sock"
SLAVE_MYPID="$MYRUN_DIR/mysqld-slave.pid"
SLAVE_MYLOG="$MYSQL_TEST_DIR/var/log/mysqld-slave.log"
SLAVE_MYERR="$MYSQL_TEST_DIR/var/log/mysqld-slave.err"