Add missing .cnf files to windows installation (Bug #4216)

scripts/make_win_binary_distribution.sh:
  Add missing .cnf files (Bug #4216)
scripts/make_win_src_distribution.sh:
  Add missing .cnf files (Bug #4216)
  Align code with MySQL 4.1

2 files changed, 21 insertions, 13 deletions

diff --git a/scripts/make_win_binary_distribution.sh b/scripts/make_win_binary_distribution.sh
index e5893c1eb1e..9b2cc2d7d22 100644
--- a/scripts/make_win_binary_distribution.sh
+++ b/scripts/make_win_binary_distribution.sh
@@ -110,6 +110,9 @@ print_debug "Copying sql-bench to $DIRNAME/bench"
 mkdir $DIRNAME/bench
 cp -fr sql-bench/* $DIRNAME/bench
 
+print_debug "Copying support-files to $DIRNAME"
+cp support-files/* $DIRNAME
+
 # Files for bin
 for i in client_release/* client_debug/mysqld.exe lib_release/libmySQL.dll
 do
@@ -124,7 +127,7 @@ do
   cp $i $DIRNAME/include
 done
 
-# Windows users are used to having dbug.h
+# Windows users are used to having dbug.h ?
 cp include/my_dbug.h $DIRNAME/include/dbug.h
 
 # Libraries found in lib_release and lib_debug
diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh
index 54c25b49035..135c2a38f87 100755
--- a/scripts/make_win_src_distribution.sh
+++ b/scripts/make_win_src_distribution.sh
@@ -178,18 +178,8 @@ rm -r -f "$BASE/share/Makefile"
 rm -r -f "$BASE/share/Makefile.in"
 rm -r -f "$BASE/share/Makefile.am"
 
-#
-# Clean up if we did this from a bk tree
-#
-
-if [ -d $BASE/SCCS ]
-then
-  find $BASE/ -type d -name SCCS -printf " \"%p\"" | xargs rm -r -f
-fi
-
 mkdir $BASE/Docs $BASE/extra $BASE/include
 
-
 #
 # Copy directory files
 #
@@ -287,7 +277,7 @@ for i in COPYING ChangeLog README \
          INSTALL-WIN-SOURCE \
          Docs/manual_toc.html  Docs/manual.html \
          Docs/manual.txt Docs/mysqld_error.txt \
-         Docs/INSTALL-BINARY
+         Docs/INSTALL-BINARY Docs/internals.texi
 
 do
   print_debug "Copying file '$i'"
@@ -298,6 +288,12 @@ do
 done
 
 #
+# support files
+#
+mkdir $BASE/support-files
+cp support-files/*.cnf $BASE/support-files
+
+#
 # Raw dirs from source tree
 #
 
@@ -312,7 +308,7 @@ do
 done
 
 #
-# Fix some windows files
+# Fix some windows files to avoid compiler warnings
 #
 
 ./extra/replace std:: "" -- $BASE/sql/sql_yacc.cpp
@@ -321,6 +317,15 @@ unix_to_dos $BASE/README
 mv $BASE/README $BASE/README.txt
 
 #
+# Clean up if we did this from a bk tree
+#
+
+if [ -d $BASE/SSL/SCCS ]
+then
+  find $BASE/ -type d -name SCCS -printf " \"%p\"" | xargs rm -r -f
+fi
+
+#
 # Initialize the initial data directory
 #