diff options
| author | Daniel Black <daniel@mariadb.org> | 2021-03-24 13:15:55 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2021-03-28 13:39:49 +1100 |
| commit | 4672cdc058ab003601dd8e5e88e7f4a44df27c97 (patch) | |
| tree | 615f576df0e00e1d2ed31443d6b8dd18d6dcab3f | |
| parent | e538cb095f6290c40e8928e3813db6ac679740a2 (diff) | |
| download | mariadb-git-bb-10.6-danielblack-MDEV-21286-remove-bison-warnings.tar.gz | |
MDEV-21286: bison warnings on ubuntu 20.04 on deprecated directive in sql_yacc.yybb-10.6-danielblack-MDEV-21286-remove-bison-warnings
%pure-parser is deprecated as of bison-2.4.0. Even centos7 is 3.0.4.
Set minimium bison version to 3.
| -rw-r--r-- | sql/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 9f44eee1f96..944ec213d9f 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -318,7 +318,7 @@ IF(WITH_MYSQLD_LDFLAGS) ENDIF() -FIND_PACKAGE(BISON 2.0) +FIND_PACKAGE(BISON 3.0) # Handle out-of-source build from source package with possibly broken diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index eb25d206f7b..e8d989f7cb3 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -333,7 +333,7 @@ static_assert(sizeof(YYSTYPE) == sizeof(void*)*2+8, "%union size check"); bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize); %} -%pure-parser /* We have threads */ +%define api.pure /* We have threads */ %parse-param { THD *thd } %lex-param { THD *thd } /* |