diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-04 19:32:13 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-04 19:32:13 +0300 |
commit | ead38354e60e0fb241de8abe0ed6a57c14dfb820 (patch) | |
tree | 308df72d136757f18f747deea29f5cbb5c161541 /sql/sql_yacc.yy | |
parent | f3bd2780632288bec8e8462404df0fea356afd7d (diff) | |
parent | 097b7b8c9e7f5900842a329286882f55aa42f27e (diff) | |
download | mariadb-git-ead38354e60e0fb241de8abe0ed6a57c14dfb820.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r-- | sql/sql_yacc.yy | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 7d73bc97ea4..d914c65658d 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -72,7 +72,8 @@ /* 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) +/* warning C4102: 'yyexhaustedlab': unreferenced label */ +#pragma warning (disable : 4065 4102) #endif #ifdef __GNUC__ #pragma GCC diagnostic ignored "-Wunused-label" /* yyexhaustedlab: */ |