Commit 3db58d5c authored by monty@donna.mysql.com's avatar monty@donna.mysql.com

Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql

parents d2745707 ffd05cad
...@@ -76,6 +76,7 @@ cp -p mysql-test/std_data/*.dat mysql-test/std_data/*.frm \ ...@@ -76,6 +76,7 @@ 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/t/*.test mysql-test/t/*.opt $BASE/mysql-test/t
cp -p mysql-test/r/*.result mysql-test/r/*.require $BASE/mysql-test/r cp -p mysql-test/r/*.result mysql-test/r/*.require $BASE/mysql-test/r
cp -p mysql-test/README* mysql-test/mysql-test-run mysql-test/create-test-result mysql-test/install_test_db mysql-test/mysql-test-run $BASE/mysql-test
cp -p scripts/* $BASE/bin cp -p scripts/* $BASE/bin
rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh $BASE/bin/mysql_install_db $BASE/bin/make_binary_distribution $BASE/bin/setsomevars $BASE/support-files/Makefile* $BASE/support-files/*.sh rm -f $BASE/bin/Makefile* $BASE/bin/*.in $BASE/bin/*.sh $BASE/bin/mysql_install_db $BASE/bin/make_binary_distribution $BASE/bin/setsomevars $BASE/support-files/Makefile* $BASE/support-files/*.sh
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment