mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
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
This commit is contained in:
parent
32f20312ee
commit
b09974a1a0
2 changed files with 4 additions and 6 deletions
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue