diff --git a/README b/README index 88cdaaf67d4..d37b37cd918 100644 --- a/README +++ b/README @@ -8,7 +8,7 @@ License information can be found in these files: For further information about MySQL or additional documentation, see: - The latest information about MySQL: http://www.mysql.com -- The current MySQL documentation: http:/dev.mysql.com/doc +- The current MySQL documentation: http://dev.mysql.com/doc Some manual sections of special interest: diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 07ae10b2b07..5a00efc986b 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -32,8 +32,9 @@ endif benchdir_root= $(prefix) testdir = $(benchdir_root)/mysql-test -EXTRA_SCRIPTS = mysql-test-run.sh mysql-test-run.pl install_test_db.sh valgrind.supp +EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh valgrind.supp EXTRA_DIST = $(EXTRA_SCRIPTS) +dist_bin_SCRIPTS = mysql-test-run.pl test_SCRIPTS = mysql-test-run install_test_db test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem \ std_data/server-cert.pem std_data/server-key.pem diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 5860e612e66..39525cc9669 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -238,6 +238,7 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \ CXXFLAGS=\"${MYSQL_BUILD_CXXFLAGS:-$RPM_OPT_FLAGS \ -felide-constructors -fno-exceptions -fno-rtti \ }\" \ + LDFLAGS=\"$MYSQL_BUILD_LDFLAGS\" \ ./configure \ $* \ --enable-assembler \ @@ -723,6 +724,10 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Sat Apr 01 2006 Kent Boortz + +- Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS + * Fri Mar 03 2006 Kent Boortz - Don't output an embedded package as it is empty