Merge bk-internal.mysql.com:/home/bk/mysql-4.0

into mysql.com:/home/my/mysql-4.0

configure.in

@@ -768,7 +768,7 @@ AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))
 
 # For compress in zlib
 case $SYSTEM_TYPE in
-  *netware*)
+  *netware* | *modesto*)
     AC_DEFINE(HAVE_COMPRESS)
     ;;
   *)

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

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'"
@@ -297,6 +287,12 @@ do
   fi
 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
@@ -320,6 +316,15 @@ done
 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
 #

sql/sql_parse.cc

@@ -2869,10 +2869,10 @@ bool check_stack_overrun(THD *thd,char *buf __attribute__((unused)))
 #define MY_YACC_INIT 1000			// Start with big alloc
 #define MY_YACC_MAX  32000			// Because of 'short'
 
-bool my_yyoverflow(short **yyss, YYSTYPE **yyvs, int *yystacksize)
+bool my_yyoverflow(short **yyss, YYSTYPE **yyvs, ulong *yystacksize)
 {
   LEX	*lex=current_lex;
-  int  old_info=0;
+  ulong old_info=0;
   if ((uint) *yystacksize >= MY_YACC_MAX)
     return 1;
   if (!lex->yacc_yyvs)

sql/sql_yacc.yy

@@ -32,7 +32,7 @@
 extern void yyerror(const char*);
 int yylex(void *yylval);
 
-#define yyoverflow(A,B,C,D,E,F) if (my_yyoverflow((B),(D),(int*) (F))) { yyerror((char*) (A)); return 2; }
+#define yyoverflow(A,B,C,D,E,F) {ulong val= *(F); if(my_yyoverflow((B), (D), &val)) { yyerror((char*) (A)); return 2; } else { *(F)= (YYSIZE_T)val; }}
 
 inline Item *or_or_concat(Item* A, Item* B)
 {
@@ -71,7 +71,7 @@ inline Item *or_or_concat(Item* A, Item* B)
 }
 
 %{
-bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
+bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
 %}
 
 %pure_parser					/* We have threads */