From b09974a1a044646c43517883480fd783f98eb267 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 28 May 2004 00:03:19 +0300 Subject: [PATCH] Remove some code from sql_yacc.cc that doesn't do anything except produce warnings on VC++ mysql-test/t/fulltext.test: After merge fix --- mysql-test/t/fulltext.test | 4 ---- scripts/make_win_src_distribution.sh | 6 ++++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test index b67997e640b..91e81c5dbe0 100644 --- a/mysql-test/t/fulltext.test +++ b/mysql-test/t/fulltext.test @@ -69,10 +69,6 @@ select * from t1 where MATCH a,b AGAINST ('+(support collections) +foobar*' IN B select * from t1 where MATCH a,b AGAINST ('+(+(support collections)) +foobar*' IN BOOLEAN MODE); select * from t1 where MATCH a,b AGAINST ('"xt indexes"' IN BOOLEAN MODE); -# bug#2708 crash - -select * from t1 where MATCH a,b AGAINST('"space model' IN BOOLEAN MODE); - # bug#2708, bug#3870 crash select * from t1 where MATCH a,b AGAINST('"space model' IN BOOLEAN MODE); diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index 68ba488f3d5..f6102085021 100755 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -302,10 +302,12 @@ do done # -# Fix some windows files +# Fix some windows files to avoid compiler warnings # -./extra/replace std:: "" -- $BASE/sql/sql_yacc.cpp +./extra/replace std:: "" < $BASE/sql/sql_yacc.cpp | sed '/^ *switch (yytype)$/ { N; /\n *{$/ { N; /\n *default:$/ { N; /\n *break;$/ { N; /\n *}$/ d; };};};} ' > $BASE/sql/sql_yacc.cpp-new +mv $BASE/sql/sql_yacc.cpp-new $BASE/sql/sql_yacc.cpp + unix_to_dos $BASE/README mv $BASE/README $BASE/README.txt