database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge trift2.:/MySQL/M50/bug21023-25486-5.0

Browse Source 
into  trift2.:/MySQL/M50/push-5.0
This commit is contained in:
unknown
2007-07-17 21:44:36 +02:00
parent a5a0a38d8d 3ec7c63645
commit c3e1eaba62
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/Makefile.am
View File

@ -35,7 +35,7 @@ testdir = $(benchdir_root)/mysql-test
EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh valgrind.supp $(PRESCRIPTS) EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh valgrind.supp $(PRESCRIPTS)
EXTRA_DIST = $(EXTRA_SCRIPTS) suite EXTRA_DIST = $(EXTRA_SCRIPTS) suite
GENSCRIPTS = mysql-test-run-shell mysql-test-run install_test_db mtr GENSCRIPTS = mysql-test-run-shell mysql-test-run install_test_db mtr
PRESCRIPTS = mysql-test-run.pl PRESCRIPTS = mysql-test-run.pl mysql-stress-test.pl
test_SCRIPTS = $(GENSCRIPTS) $(PRESCRIPTS) test_SCRIPTS = $(GENSCRIPTS) $(PRESCRIPTS)
test_DATA = std_data/client-key.pem \ test_DATA = std_data/client-key.pem \
std_data/client-cert.pem \ std_data/client-cert.pem \

3
scripts/make_binary_distribution.sh
View File

@ -284,7 +284,8 @@ rm -f $MYSQL_SHARE/Makefile* $MYSQL_SHARE/*/*.OLD
copyfileto $BASE/mysql-test \ copyfileto $BASE/mysql-test \
mysql-test/mysql-test-run mysql-test/install_test_db \ mysql-test/mysql-test-run mysql-test/install_test_db \
mysql-test/mysql-test-run.pl mysql-test/README \ mysql-test/mysql-test-run.pl mysql-test/README \
mysql-test/valgrind.supp \ mysql-test/mysql-stress-test.pl \
mysql-test/valgrind.supp \
netware/mysql_test_run.nlm netware/install_test_db.ncf netware/mysql_test_run.nlm netware/install_test_db.ncf
$CP mysql-test/lib/*.pl $BASE/mysql-test/lib $CP mysql-test/lib/*.pl $BASE/mysql-test/lib

5
support-files/Makefile.am
View File

@ -25,6 +25,7 @@ EXTRA_DIST = mysql.spec.sh \
my-innodb-heavy-4G.cnf.sh \ my-innodb-heavy-4G.cnf.sh \
mysql-log-rotate.sh \ mysql-log-rotate.sh \
mysql.server.sh \ mysql.server.sh \
mysqld_multi.server.sh \
binary-configure.sh \ binary-configure.sh \
magic \ magic \
MySQL-shared-compat.spec.sh \ MySQL-shared-compat.spec.sh \
@ -42,7 +43,8 @@ pkgdata_DATA = my-small.cnf \
binary-configure \ binary-configure \
ndb-config-2-node.ini ndb-config-2-node.ini
pkgdata_SCRIPTS = mysql.server pkgdata_SCRIPTS = mysql.server \
mysqld_multi.server
noinst_DATA = mysql-@VERSION@.spec \ noinst_DATA = mysql-@VERSION@.spec \
MySQL-shared-compat.spec MySQL-shared-compat.spec
@ -56,6 +58,7 @@ CLEANFILES = my-small.cnf \
mysql-@VERSION@.spec \ mysql-@VERSION@.spec \
mysql-log-rotate \ mysql-log-rotate \
mysql.server \ mysql.server \
mysqld_multi.server \
binary-configure \ binary-configure \
MySQL-shared-compat.spec \ MySQL-shared-compat.spec \
ndb-config-2-node.ini ndb-config-2-node.ini