From d75022fff73ea5fc440966ae132fbdadb351b674 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 24 Jun 2004 22:15:15 +0300 Subject: [PATCH 1/3] parameter of my_yyoverflow made independed from YYSIZE_T (BUG#4204) sql/sql_parse.cc: parameter of my_yyoverflow made independed from YYSIZE_T sql/sql_yacc.yy: parameter of my_yyoverflow made independed from YYSIZE_T --- sql/sql_parse.cc | 4 ++-- sql/sql_yacc.yy | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index e3d19de6374..19330d2266e 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2330,10 +2330,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) diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index d751dcd0927..1ed6d7a5fbf 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -30,7 +30,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) { @@ -65,7 +65,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 */ From 72093a6d14e14d2d88b073f908b089103a9de06a Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 25 Jun 2004 18:54:43 +0300 Subject: [PATCH 2/3] 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 --- scripts/make_win_binary_distribution.sh | 5 ++++- scripts/make_win_src_distribution.sh | 29 +++++++++++++++---------- 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'" @@ -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 # From 3eb5fd0f24275c6c6474e6ee94fce2ef8f70a491 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 27 Jun 2004 18:20:06 +0300 Subject: [PATCH 3/3] Fix to be able to cross-compile for modesto scripts/make_win_src_distribution.sh: Change mode to -rw-rw-r-- --- configure.in | 2 +- scripts/make_win_src_distribution.sh | 0 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 scripts/make_win_src_distribution.sh diff --git a/configure.in b/configure.in index e346ebfa15e..516b521034b 100644 --- a/configure.in +++ b/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) ;; *) diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh old mode 100755 new mode 100644