diff options
| author | Gleb Shchepa <gleb.shchepa@oracle.com> | 2014-06-23 19:59:15 +0400 |
|---|---|---|
| committer | Gleb Shchepa <gleb.shchepa@oracle.com> | 2014-06-23 19:59:15 +0400 |
| commit | 7141ae856164c19b6c6faefb4ea7e21a98b0c92a (patch) | |
| tree | 588f77c9e40c5133d2b6c67d7c19be761b99c760 /sql/sql_lex.h | |
| parent | 2e26e9057cb39e85699d41642802faa4e6995471 (diff) | |
| download | mariadb-git-7141ae856164c19b6c6faefb4ea7e21a98b0c92a.tar.gz | |
Bug #18978946: BACKPORT TO 5.6: BUGFIX FOR 18017820 "BISON 3 BREAKS MYSQL BUILD"
Backport of the fix:
: Bug 18017820: BISON 3 BREAKS MYSQL BUILD
: ========================================
:
: The source of the reported problem is a removal of a few deprecated
: things from Bison 3.x:
: * YYPARSE_PARAM macro (use the %parse-param bison directive instead),
: * YYLEX_PARAM macro (use %lex-param instead),
:
: The fix removes obsolete macro calls and introduces use of
: %parse-param and %lex-param directives.
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 40fea173a7a..c5886b3c142 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. reserved. - reserved. +/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -2794,7 +2793,7 @@ extern void lex_init(void); extern void lex_free(void); extern void lex_start(THD *thd); extern void lex_end(LEX *lex); -extern int MYSQLlex(void *arg, void *yythd); +extern int MYSQLlex(union YYSTYPE *yylval, class THD *thd); extern void trim_whitespace(CHARSET_INFO *cs, LEX_STRING *str); |