summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-05-28 00:03:19 +0300
committerunknown <monty@mysql.com>2004-05-28 00:03:19 +0300
commitb09974a1a044646c43517883480fd783f98eb267 (patch)
tree31f895c8a1ad0626aa679e66cfa3ecfcbb53f496 /scripts
parent32f20312ee66b77e54bab6a67317098769ab40c4 (diff)
downloadmariadb-git-b09974a1a044646c43517883480fd783f98eb267.tar.gz
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
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/make_win_src_distribution.sh6
1 files changed, 4 insertions, 2 deletions
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