summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2000-12-16 23:41:45 +0200
committermonty@donna.mysql.com <>2000-12-16 23:41:45 +0200
commit5cce198b6959a910925bf90c5abfb2275bff1891 (patch)
treea884910ed118d34b9de837e52be9e458c4b8619d /scripts
parentbed1668e238593454c756a1f3f68a4e0be5ec929 (diff)
downloadmariadb-git-5cce198b6959a910925bf90c5abfb2275bff1891.tar.gz
Fixed error when copying mysqld_multi
Fixes for mysql-test Fixed race condition in SHOW LOGS
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.am2
-rw-r--r--scripts/make_binary_distribution.sh6
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index cced1944d9e..5b3347081c4 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -43,7 +43,7 @@ EXTRA_SCRIPTS = make_binary_distribution.sh \
mysql_find_rows.sh \
mysqlhotcopy.sh \
mysqldumpslow.sh \
- mysqld_multi \
+ mysqld_multi.sh \
safe_mysqld.sh
EXTRA_DIST = $(EXTRA_SCRIPTS) \
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 9c79ecea735..0065fdc6208 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -69,11 +69,11 @@ cp -r -p sql/share/* $BASE/share/mysql
rm -f $BASE/share/mysql/Makefile* $BASE/share/mysql/*/*.OLD
rm -rf $BASE/share/SCCS $BASE/share/*/SCCS
-cp -p mysql-test/mysql-test-run mysql-test/install_test_db $BASE/scripts
-cp -p mysql-test/README $BASE/README
+cp -p mysql-test/mysql-test-run mysql-test/install_test_db $BASE/mysql-test/
+cp -p mysql-test/README $BASE/mysql-test/README
cp -p mysql-test/include/*.inc $BASE/mysql-test/include
cp -p mysql-test/std_data/*.dat mysql-test/std_data/*.frm \
- mysql-test/std_data/*.MRG $BASE/mysql-test/std_data
+ mysql-test/std_data/*.MRG $BASE/mysql-test/std_data
cp -p mysql-test/t/*.test mysql-test/t/*.opt $BASE/mysql-test/t
cp -p mysql-test/r/*.result $BASE/mysql-test/r