diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-07-15 16:46:25 +0300 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-07-15 16:46:25 +0300 |
| commit | 45b687c087beab11815c17546db933b8ab7191ee (patch) | |
| tree | ea0b301e5ab03dbeb0d739fbb172d2221329c2db /sql/sql_yacc.yy | |
| parent | 7cf4e36f2d4d9eb222bd1722d06e8c89c0e227a2 (diff) | |
| download | mariadb-git-45b687c087beab11815c17546db933b8ab7191ee.tar.gz | |
Bug #45287: phase 1 : 32 bit compilation warnings
Fixed the following problems:
1. cmake 2.6 warning because of a changed default on
how the dependencies to libraries with a specified
path are resolved.
Fixed by requiring cmake 2.6.
2. Removed an obsolete pre-NT4 hack including defining
Windows system defines to alter the behavior of windows.h.
3. Disabled warning C4065 on compiling sql_yacc.cc because
of a know incompatibility in some of the newer bison binaries.
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 49b7fafcc0b..cde2e8dac3e 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -41,6 +41,12 @@ #include <myisam.h> #include <myisammrg.h> +/* this is to get the bison compilation windows warnings out */ +#ifdef _MSC_VER +/* warning C4065: switch statement contains 'default' but no 'case' labels */ +#pragma warning (disable : 4065) +#endif + int yylex(void *yylval, void *yythd); const LEX_STRING null_lex_str={0,0}; |