Merge with 4.0.16

4 files changed, 54 insertions, 42 deletions

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 7ccf35b9580..4782c763447 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -17,7 +17,6 @@
 ## Process this file with automake to create Makefile.in
 
 bin_SCRIPTS =		@server_scripts@ \
-			make_win_src_distribution \
 			msql2mysql \
 			mysql_config \
 			mysql_fix_privilege_tables \
@@ -34,6 +33,7 @@ bin_SCRIPTS =		@server_scripts@ \
 			mysql_explain_log \
 			mysql_tableinfo \
 			mysqld_multi \
+			make_win_src_distribution \
 			mysql_create_system_tables
 
 EXTRA_SCRIPTS =		make_binary_distribution.sh \
@@ -69,7 +69,6 @@ dist_pkgdata_DATA =		fill_help_tables.sql mysql_fix_privilege_tables.sql
 # failures with it.
 CLEANFILES =		@server_scripts@ \
 			make_binary_distribution \
-			make_win_src_distribution \
 			msql2mysql \
 			mysql_config \
 			mysql_fix_privilege_tables \
@@ -83,6 +82,7 @@ CLEANFILES =		@server_scripts@ \
 			mysqlhotcopy \
 			mysqldumpslow \
 			mysqld_multi \
+			make_win_src_distribution \
 			fill_help_tables \
 			mysql_create_system_tables
 
@@ -119,6 +119,7 @@ SUFFIXES = .sh
 	  -e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \
 	  -e 's!@''LIBS''@!@LIBS@!' \
 	  -e 's!@''innodb_system_libs''@!@innodb_system_libs@!' \
+	  -e 's!@''openssl_libs''@!@openssl_libs@!' \
 	  -e 's!@''VERSION''@!@VERSION@!' \
 	  -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
 	  -e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \
diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh
index 02eb5366b01..2f1b7b2939a 100755
--- a/scripts/make_win_src_distribution.sh
+++ b/scripts/make_win_src_distribution.sh
@@ -114,37 +114,16 @@ done
 # Convert argument file from unix to DOS text
 #
 
-if [ `which recode` ]
-then
-
-  print_debug "Using 'recode' to convert from unix to dos text"
-
-  unix_to_dos()
-  {
-    for arg do
-      print_debug "Replacing LF -> CRLF from '$arg'"
-
-      chmod u+w $arg
-      recode lat1..ibmpc $arg
-    done
-  }
-
-else
-
-  print_debug "Using 'sed' to convert from unix to dos text"
-
-  unix_to_dos()
-  {
-    for arg do
-      print_debug "Replacing LF -> CRLF from '$arg'"
-
-      sed -e 's/$/\r/' $arg > $arg.tmp
-      rm -f $arg
-      mv $arg.tmp $arg
-    done
-  }
+unix_to_dos()
+{
+  for arg do
+    print_debug "Replacing LF -> CRLF from '$arg'"
 
-fi
+    cat $arg | awk '{sub(/$/,"\r");print}' > $arg.tmp
+    rm -f $arg
+    mv $arg.tmp $arg
+  done
+}
 
 
 #
@@ -169,6 +148,28 @@ find $BASE \( -name "*.dsp" -o -name "*.dsw" \) -and -not -path \*SCCS\* -print
 )
 
 #
+# Process version tags in InstallShield files
+#
+
+vreplace()
+{
+  for arg do
+    unix_to_dos $arg
+    cat $arg | sed -e 's!@''VERSION''@!@VERSION@!' > $arg.tmp
+    rm -f $arg
+    mv $arg.tmp $arg
+  done
+}
+
+for d in 4.0.XX-gpl 4.0.XX-pro 4.0.XX-classic
+do
+  cd $BASE/InstallShield/$d/String\ Tables/0009-English
+  vreplace value.shl
+  cd ../../Setup\ Files/Compressed\ Files/Language\ Independent/OS\ Independent
+  vreplace infolist.txt
+done
+
+#
 # Move all error message files to root directory
 #
 
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
index e8cc9322eaf..52284104636 100644
--- a/scripts/mysql_config.sh
+++ b/scripts/mysql_config.sh
@@ -84,18 +84,27 @@ port='@MYSQL_TCP_PORT@'
 ldflags='@LDFLAGS@'
 client_libs='@CLIENT_LIBS@'
 
-libs="$ldflags -L'$pkglibdir' -lmysqlclient $client_libs"
-libs=`echo $libs | sed -e 's; +;;'`
-libs_r="$ldflags -L'$pkglibdir' -lmysqlclient_r $client_libs"
-libs_r=`echo $libs_r | sed -e 's; +;;'`
-cflags="-I'$pkgincludedir'"
-embedded_libs="$ldflags -L'$pkglibdir' -lmysqld @LIBS@ @innodb_system_libs@"
+# Create options, without end space
+
+libs="$ldflags -L$pkglibdir -lmysqlclient $client_libs"
+libs=`echo "$libs" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`
+libs_r="$ldflags -L$pkglibdir -lmysqlclient_r @LIBS@ @openssl_libs@"
+libs_r=`echo "$libs_r" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`
+cflags="-I$pkgincludedir @CFLAGS@"
+include="-I$pkgincludedir"
+embedded_libs="$ldflags -L$pkglibdir -lmysqld @LIBS@ @innodb_system_libs@"
+embedded_libs=`echo "$embedded_libs" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`
+
+# Remove some options that a client doesn't have to care about
+
+cflags=`echo "$cflags " | sed -e 's;\(-DDBUG_OFF\|-DSAFEMALLOC\|-USAFEMALLOC\|-DSAFE_MUTEX\|-DPEDANTIC_SAFEMALLOC\|-DUNIV_MUST_NOT_INLINE\|-DFORCE_INIT_OF_VARS\|-DEXTRA_DEBUG\|-DHAVE_purify\|-O[0-9]\|-W[-A-Za-z]*\) *;;g' | sed -e 's; *\$;;'` 
 
 usage () {
         cat <<EOF
 Usage: $0 [OPTIONS]
 Options:
         --cflags         [$cflags]
+	--include	 [$include]
         --libs           [$libs]
         --libs_r         [$libs_r]
         --socket         [$socket]
@@ -111,6 +120,7 @@ if test $# -le 0; then usage; fi
 while test $# -gt 0; do
         case $1 in
         --cflags)  echo "$cflags" ;;
+	--include) echo "$include" ;;
         --libs)    echo "$libs" ;;
         --libs_r)  echo "$libs_r" ;;
         --socket)  echo "$socket" ;;
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 65731c2bcb7..bba32fe79f8 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -143,7 +143,7 @@ fi
 hostname=`@HOSTNAME@`
 
 # Check if hostname is valid
-if test "$windows" -eq 0 -a "$in_rpm" -eq 0 -a $force -eq 0
+if test "$windows" = 0 -a "$in_rpm" = 0 -a $force = 0
 then
   resolved=`$bindir/resolveip $hostname 2>&1`
   if [ $? -ne 0 ]
@@ -160,7 +160,7 @@ then
     fi
     echo "WARNING: The host '$hostname' could not be looked up with resolveip."
     echo "This probably means that your libc libraries are not 100 % compatible"
-    echo "with this binary MySQL version. The MySQL deamon, mysqld, should work"
+    echo "with this binary MySQL version. The MySQL daemon, mysqld, should work"
     echo "normally with the exception that host name resolving will not work."
     echo "This means that you should use IP addresses instead of hostnames"
     echo "when specifying MySQL privileges !"
@@ -207,7 +207,7 @@ if (
 ) | eval "$mysqld $defaults $mysqld_opt --bootstrap --skip-grant-tables \
          --basedir=$basedir --datadir=$ldata --skip-innodb --skip-bdb $args" 
 then
-  if test "$in_rpm" -eq 0 -a "$windows" -eq 0
+  if test "$in_rpm" = 0 -a "$windows" = 0
   then
     echo ""
     echo "To start mysqld at boot time you have to copy support-files/mysql.server"
@@ -231,7 +231,7 @@ then
     echo "able to use the new GRANT command!"
   fi
   echo
-  if test "$in_rpm" -eq 0
+  if test "$in_rpm" = "0"
   then
     echo "You can start the MySQL daemon with:"
     echo "cd @prefix@ ; $bindir/mysqld_safe &"