From fa7e5ed5d7c6f40ddebe88de099f4ba0ee502d47 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 31 Mar 2006 01:03:45 +0200 Subject: zlib.m4, openssl.m4: Use when testing if shared library exists, bug#16332 config/ac-macros/openssl.m4: Use when testing if shared library exists, bug#16332 config/ac-macros/zlib.m4: Use when testing if shared library exists, bug#16332 --- config/ac-macros/openssl.m4 | 6 ++++-- config/ac-macros/zlib.m4 | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config/ac-macros/openssl.m4 b/config/ac-macros/openssl.m4 index aa46dd45360..1f9d53abe01 100644 --- a/config/ac-macros/openssl.m4 +++ b/config/ac-macros/openssl.m4 @@ -14,7 +14,8 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ for d in /usr/ssl/lib /usr/local/ssl/lib /usr/lib/openssl \ /usr/lib /usr/lib64 /opt/ssl/lib /opt/openssl/lib \ /usr/freeware/lib32 /usr/local/lib/ ; do - if test -f $d/libssl.a || test -f $d/libssl.so || test -f $d/libssl.dylib ; then + # Just to be safe, we test for ".so" anyway + if test -f $d/libssl.a || test -f $d/libssl.so || test -f $d/libssl$shrext_cmds ; then OPENSSL_LIB=$d fi done @@ -26,7 +27,8 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ if test -f $incs/openssl/ssl.h ; then OPENSSL_INCLUDE=-I$incs fi - if test -f $libs/libssl.a || test -f $libs/libssl.so || test -f $libs/libssl.dylib ; then + # Just to be safe, we test for ".so" anyway + if test -f $libs/libssl.a || test -f $libs/libssl.so || test -f $libs/libssl$shrext_cmds ; then OPENSSL_LIB=$libs fi ;; diff --git a/config/ac-macros/zlib.m4 b/config/ac-macros/zlib.m4 index ec55f19b98f..8aafb3f4ced 100644 --- a/config/ac-macros/zlib.m4 +++ b/config/ac-macros/zlib.m4 @@ -89,8 +89,9 @@ case $SYSTEM_TYPE in fi ;; *) + # Just to be safe, we test for ".so" anyway if test \( -f "$mysql_zlib_dir/lib/libz.a" -o -f "$mysql_zlib_dir/lib/libz.so" -o \ - -f "$mysql_zlib_dir/lib/libz.sl" -o -f "$mysql_zlib_dir/lib/libz.dylib" \) \ + -f "$mysql_zlib_dir/lib/libz$shrext_cmds" \) \ -a -f "$mysql_zlib_dir/include/zlib.h"; then ZLIB_INCLUDES="-I$mysql_zlib_dir/include" ZLIB_LIBS="-L$mysql_zlib_dir/lib -lz" -- cgit v1.2.1 From 1de12691168ea72c5ae3de93ddf400f8cad8bfa9 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 31 Mar 2006 22:54:26 +0300 Subject: Fixed a typo. --- sql/item.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sql/item.cc b/sql/item.cc index 036812f2f76..45a6b0cef31 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -532,8 +532,9 @@ bool Item_field::collect_item_field_processor(byte *arg) RETURN TRUE if 'this' references the field 'arg' - FALE otherwise + FALSE otherwise */ + bool Item_field::find_item_in_field_list_processor(byte *arg) { KEY_PART_INFO *first_non_group_part= *((KEY_PART_INFO **) arg); -- cgit v1.2.1 From 872d1d71a1d6b6aba2aa0af98cdffb4bb3c01325 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 1 Apr 2006 01:24:28 +0200 Subject: Makefile.am, yassl.m4: Enable automake to determine dependency on yaSSL, by explicitly listing the .la files in Makefile.am, instead of using 'yassl_libs_with_path', bug#18273 config/ac-macros/yassl.m4: Enable automake to determine dependency on yaSSL, by explicitly listing the .la files in Makefile.am, instead of using 'yassl_libs_with_path', bug#18273 libmysql/Makefile.am: Enable automake to determine dependency on yaSSL, by explicitly listing the .la files in Makefile.am, instead of using 'yassl_libs_with_path', bug#18273 libmysql_r/Makefile.am: Enable automake to determine dependency on yaSSL, by explicitly listing the .la files in Makefile.am, instead of using 'yassl_libs_with_path', bug#18273 --- config/ac-macros/yassl.m4 | 2 -- libmysql/Makefile.am | 6 +++++- libmysql_r/Makefile.am | 6 +++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4 index b4160ad2a99..0de93670663 100644 --- a/config/ac-macros/yassl.m4 +++ b/config/ac-macros/yassl.m4 @@ -17,7 +17,6 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ yassl_dir="extra/yassl" yassl_libs="-L\$(top_srcdir)/extra/yassl/src -lyassl -L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt" yassl_includes="-I\$(top_srcdir)/extra/yassl/include" - yassl_libs_with_path="\$(top_srcdir)/extra/yassl/src/libyassl.la \$(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la" AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.]) AC_DEFINE([HAVE_YASSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.]) # System specific checks @@ -38,7 +37,6 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ AC_MSG_RESULT(no) fi AC_SUBST(yassl_libs) - AC_SUBST(yassl_libs_with_path) AC_SUBST(yassl_includes) AC_SUBST(yassl_dir) AM_CONDITIONAL([HAVE_YASSL], [ test "with_yassl" = "yes" ]) diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am index a3e16b521a9..2c7dc572b5e 100644 --- a/libmysql/Makefile.am +++ b/libmysql/Makefile.am @@ -29,7 +29,11 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ include $(srcdir)/Makefile.shared libmysqlclient_la_SOURCES = $(target_sources) -libmysqlclient_la_LIBADD = $(target_libadd) $(yassl_libs_with_path) +libmysqlclient_la_LIBADD = $(target_libadd) +if HAVE_YASSL +libmysqlclient_la_LIBADD+= $(top_srcdir)/extra/yassl/src/libyassl.la \ + $(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la +endif libmysqlclient_la_LDFLAGS = $(target_ldflags) EXTRA_DIST = Makefile.shared libmysql.def noinst_HEADERS = client_settings.h diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am index 11e65a28a19..7bd3b0f4bbe 100644 --- a/libmysql_r/Makefile.am +++ b/libmysql_r/Makefile.am @@ -32,7 +32,11 @@ include $(top_srcdir)/libmysql/Makefile.shared libmysql_dir = $(top_srcdir)/libmysql libmysqlclient_r_la_SOURCES = $(target_sources) -libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_libs_with_path) +libmysqlclient_r_la_LIBADD = $(target_libadd) +if HAVE_YASSL +libmysqlclient_r_la_LIBADD+= $(top_srcdir)/extra/yassl/src/libyassl.la \ + $(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la +endif libmysqlclient_r_la_LDFLAGS = $(target_ldflags) # This is called from the toplevel makefile -- cgit v1.2.1 From 0ad405f9d4665a13e74c60520186f25d48b4c8ff Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 1 Apr 2006 02:14:54 +0200 Subject: vcproj files: Set MYSQL_SERVER_SUFFIX from build scripts, not hard code it into Visual Studio project files, bug#15974 VC++Files/bdb/bdb.vcproj: Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974 VC++Files/innobase/innobase.vcproj: Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974 VC++Files/libmysqld/libmysqld.vcproj: Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974 VC++Files/mysqldemb/mysqldemb.vcproj: Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974 VC++Files/mysys/mysys.vcproj: Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974 VC++Files/sql/mysqld.vcproj: Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974 --- VC++Files/bdb/bdb.vcproj | 1 - VC++Files/innobase/innobase.vcproj | 2 -- VC++Files/libmysqld/libmysqld.vcproj | 1 - VC++Files/mysqldemb/mysqldemb.vcproj | 1 - VC++Files/mysys/mysys.vcproj | 1 - VC++Files/sql/mysqld.vcproj | 7 ------- 6 files changed, 13 deletions(-) diff --git a/VC++Files/bdb/bdb.vcproj b/VC++Files/bdb/bdb.vcproj index 6258da3cb3a..56c4da94084 100644 --- a/VC++Files/bdb/bdb.vcproj +++ b/VC++Files/bdb/bdb.vcproj @@ -19,7 +19,6 @@ ATLMinimizesCRunTimeLibraryUsage="FALSE"> Date: Sat, 1 Apr 2006 03:28:07 +0200 Subject: acinclude.m4: Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=, and search the given include directory first (bug#18369) acinclude.m4: Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=, and search the given include directory first (bug#18369) --- acinclude.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index d9b8030696d..9af6d2c3acd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -233,9 +233,9 @@ mysql_cv_compress="yes" dnl Auxiliary macro to check for zlib at given path AC_DEFUN([MYSQL_CHECK_ZLIB_DIR], [ -save_INCLUDES="$INCLUDES" +save_CPPFLAGS="$CPPFLAGS" save_LIBS="$LIBS" -INCLUDES="$INCLUDES $ZLIB_INCLUDES" +CPPFLAGS="$ZLIB_INCLUDES $CPPFLAGS" LIBS="$LIBS $ZLIB_LIBS" AC_CACHE_VAL([mysql_cv_compress], [AC_TRY_LINK([#include ], @@ -244,7 +244,7 @@ AC_CACHE_VAL([mysql_cv_compress], AC_MSG_RESULT([ok])], [mysql_cv_compress="no"]) ]) -INCLUDES="$save_INCLUDES" +CPPFLAGS="$save_CPPFLAGS" LIBS="$save_LIBS" ]) -- cgit v1.2.1 From 3ff1ec0f89f6f829f711118d017a9d0a6dfbaa37 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 1 Apr 2006 03:49:14 +0200 Subject: zlib.m4: Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=, and search the given include directory first (bug#18369) config/ac-macros/zlib.m4: Use CPPFLAGS when testing to link "libz" found in --with-zlib-dir=, and search the given include directory first (bug#18369) --- config/ac-macros/zlib.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/ac-macros/zlib.m4 b/config/ac-macros/zlib.m4 index 8aafb3f4ced..a8c54c845a1 100644 --- a/config/ac-macros/zlib.m4 +++ b/config/ac-macros/zlib.m4 @@ -13,9 +13,9 @@ mysql_cv_compress="yes" dnl Auxiliary macro to check for zlib at given path AC_DEFUN([MYSQL_CHECK_ZLIB_DIR], [ -save_INCLUDES="$INCLUDES" +save_CPPFLAGS="$CPPFLAGS" save_LIBS="$LIBS" -INCLUDES="$INCLUDES $ZLIB_INCLUDES" +CPPFLAGS="$ZLIB_INCLUDES $CPPFLAGS" LIBS="$LIBS $ZLIB_LIBS" AC_CACHE_VAL([mysql_cv_compress], [AC_TRY_LINK([#include ], @@ -24,7 +24,7 @@ AC_CACHE_VAL([mysql_cv_compress], AC_MSG_RESULT([ok])], [mysql_cv_compress="no"]) ]) -INCLUDES="$save_INCLUDES" +CPPFLAGS="$save_CPPFLAGS" LIBS="$save_LIBS" ]) -- cgit v1.2.1 From c19a6fc5c3a9bd69e692c28d4fdbe7f2933e0bb7 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 1 Apr 2006 04:13:33 +0200 Subject: README: Typo (bug#17167) README: Typo (bug#17167) --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: -- cgit v1.2.1 From 2a4e2e8da2e6e15ba20442f35e83a1e371d22035 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 1 Apr 2006 05:44:10 +0200 Subject: Makefile.am: Let "make install" install mysql-test-run.pl mysql.spec.sh: Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662) support-files/mysql.spec.sh: Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662) mysql-test/Makefile.am: Let "make install" install mysql-test-run.pl --- mysql-test/Makefile.am | 3 ++- support-files/mysql.spec.sh | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 9a88aff8300..1ed703c562a 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 +EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh 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 42958a3a871..b161ec13073 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -231,6 +231,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 \ @@ -689,6 +690,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 Jan 10 2006 Joerg Bruehe - Use "-i" on "make test-force"; -- cgit v1.2.1 From 6de1d9d378b2b326178bec3638685b629418533b Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 2 Apr 2006 02:10:41 +0200 Subject: Makefile.am: Install Perl mysql-test-run into test directory mysql-test/Makefile.am: Install Perl mysql-test-run into test directory --- mysql-test/Makefile.am | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 1ed703c562a..f7d4ba0d55a 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -34,11 +34,12 @@ benchdir_root= $(prefix) testdir = $(benchdir_root)/mysql-test EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh EXTRA_DIST = $(EXTRA_SCRIPTS) -dist_bin_SCRIPTS = mysql-test-run.pl -test_SCRIPTS = mysql-test-run install_test_db +GENSCRIPTS = mysql-test-run install_test_db +PRESCRIPTS = mysql-test-run.pl +test_SCRIPTS = $(GENSCRIPTS) $(PRESCRIPTS) 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 -CLEANFILES = $(test_SCRIPTS) $(test_DATA) +CLEANFILES = $(GENSCRIPTS) $(test_DATA) INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I.. EXTRA_PROGRAMS = mysql_test_run_new -- cgit v1.2.1 From e2b19a59d2e19cb30e6b71ac7a4fc8dc6e641130 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 3 Apr 2006 03:37:43 +0200 Subject: mysql_install_db.sh, MySQLEULA.txt, mysql_install_db.c: Changed web address order.mysql.com to shop.mysql.com netware/mysql_install_db.c: Changed web address order.mysql.com to shop.mysql.com Docs/MySQLEULA.txt: Changed web address order.mysql.com to shop.mysql.com scripts/mysql_install_db.sh: Changed web address order.mysql.com to shop.mysql.com --- Docs/MySQLEULA.txt | 2 +- netware/mysql_install_db.c | 2 +- scripts/mysql_install_db.sh | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Docs/MySQLEULA.txt b/Docs/MySQLEULA.txt index 71e630ec81f..f50c50298b1 100644 --- a/Docs/MySQLEULA.txt +++ b/Docs/MySQLEULA.txt @@ -63,7 +63,7 @@ Licensee. 4. Price and payment. No later than thirty (30) days after submission of the Order Form, Licensee shall remit one non-refundable license fee per Licensed Copy as posted on -http://order.mysql.com on the date Licensee submitted the Order Form (the +http://shop.mysql.com on the date Licensee submitted the Order Form (the "License Fee"). All payments shall be made in Euros or U.S. dollars. Licensee shall be responsible for paying all local, state, federal and international sales, value added, excise and other taxes and duties payable in connection diff --git a/netware/mysql_install_db.c b/netware/mysql_install_db.c index 355e18b819a..65ee7873e5c 100644 --- a/netware/mysql_install_db.c +++ b/netware/mysql_install_db.c @@ -423,7 +423,7 @@ int main(int argc, char **argv) printf("\nThe latest information about MySQL is available on the web at\n"); printf("\thttp://www.mysql.com\n"); - printf("\nSupport MySQL by buying support at https://order.mysql.com\n\n"); + printf("\nSupport MySQL by buying support at http://shop.mysql.com\n\n"); return 0; } diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 0b3742638f5..6aaeefaec17 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -1,3 +1,4 @@ + #!/bin/sh # Copyright (C) 2002-2004 MySQL AB # For a more info consult the file COPYRIGHT distributed with this file. @@ -397,7 +398,7 @@ then echo echo "The latest information about MySQL is available on the web at" echo "http://www.mysql.com" - echo "Support MySQL by buying support/licenses at https://order.mysql.com" + echo "Support MySQL by buying support/licenses at http://shop.mysql.com" echo exit 0 else -- cgit v1.2.1 From 2574445ef11585ca17a9f904ec2e818c9e9c8c50 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 3 Apr 2006 03:47:28 +0200 Subject: Makefile.am: Distribute mysql-test-run.pl mysql-test/Makefile.am: Distribute mysql-test-run.pl --- mysql-test/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index f7d4ba0d55a..7c2415dd6b6 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -32,7 +32,7 @@ endif benchdir_root= $(prefix) testdir = $(benchdir_root)/mysql-test -EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh +EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh $(PRESCRIPTS) EXTRA_DIST = $(EXTRA_SCRIPTS) GENSCRIPTS = mysql-test-run install_test_db PRESCRIPTS = mysql-test-run.pl -- cgit v1.2.1