Merge

VC++Files/libmysqld/libmysqld.vcproj: Auto merged VC++Files/mysqldemb/mysqldemb.vcproj: Auto merged VC++Files/mysys/mysys.vcproj: Auto merged VC++Files/sql/mysqld.vcproj: Auto merged VC++Files/storage/bdb/bdb.vcproj: Auto merged VC++Files/storage/innobase/innobase.vcproj: Auto merged config/ac-macros/yassl.m4: Auto merged libmysql/Makefile.am: Auto merged libmysql_r/Makefile.am: Auto merged mysql-test/Makefile.am: Auto merged sql/item.cc: Auto merged
2025-07-30 16:24:05 +03:00 · 2006-04-04 23:37:44 +02:00
parent af66d20c8e b5ca723613
commit 07302c6007
18 changed files with 37 additions and 31 deletions
--- 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
--- a/2
+++ b/2
@ -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:

--- a/VC++Files/libmysqld/libmysqld.vcproj
+++ b/VC++Files/libmysqld/libmysqld.vcproj
@ -86,7 +86,6 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-pro"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
--- a/VC++Files/mysqldemb/mysqldemb.vcproj
+++ b/VC++Files/mysqldemb/mysqldemb.vcproj
@ -71,7 +71,6 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-pro"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="../include,../regex,../libmysqld,../sql,../zlib"
--- a/VC++Files/mysys/mysys.vcproj
+++ b/VC++Files/mysys/mysys.vcproj
@ -67,7 +67,6 @@
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-max"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
--- a/VC++Files/sql/mysqld.vcproj
+++ b/VC++Files/sql/mysqld.vcproj
@ -20,7 +20,6 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-classic-nt"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
@ -82,7 +81,6 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-max"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
@ -143,7 +141,6 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-nt-max"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
@ -207,7 +204,6 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-nt"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
@ -271,7 +267,6 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-pro-nt"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
@ -393,7 +388,6 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-pro"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
@ -455,7 +449,6 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-classic"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
--- a/VC++Files/storage/bdb/bdb.vcproj
+++ b/VC++Files/storage/bdb/bdb.vcproj
@ -20,7 +20,6 @@
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-max"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
--- a/VC++Files/storage/innobase/innobase.vcproj
+++ b/VC++Files/storage/innobase/innobase.vcproj
@ -21,7 +21,6 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-nt-max"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
@ -176,7 +175,6 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-nt"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
--- 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
      ;;
--- 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" ])
--- 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 <zlib.h>],
@ -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"
 ])

@ -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"
--- 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 dll.c mytest.c cmakelists.txt
 noinst_HEADERS = client_settings.h
--- 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
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@ -22,12 +22,14 @@ DIST_SUBDIRS=ndb

 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 $(PRESCRIPTS)
 EXTRA_DIST = 		$(EXTRA_SCRIPTS) 
-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
--- 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;
 }
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@ -1,3 +1,4 @@
+
 #!/bin/sh
 # Copyright (C) 2002-2003 MySQL AB
 # For a more info consult the file COPYRIGHT distributed with this file.
@ -269,7 +270,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"
  fi
  exit 0
 else
--- 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);
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@ -1,3 +1,4 @@
+
 %define mysql_version		@VERSION@

 # use "rpmbuild --with static" or "rpm --define '_with_static 1'" (for RPM 3.x)
@ -217,6 +218,7 @@ sh -c  "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
 	CXX=\"${CXX:-$MYSQL_BUILD_CXX}\" \
 	CFLAGS=\"$CFLAGS\" \
 	CXXFLAGS=\"$CXXFLAGS\" \
+	LDFLAGS=\"$MYSQL_BUILD_LDFLAGS\" \
 	./configure \
 	    $* \
 	    --with-mysqld-ldflags='-static' \
@ -709,6 +711,10 @@ fi
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Sat Apr 01 2006 Kent Boortz <kent@mysql.com>
+
+- Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS
+
 * Wed Mar 07 2006 Kent Boortz <kent@mysql.com>

 - Changed product name from "Community Edition" to "Community Server"