1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug #18978946: BACKPORT TO 5.6: BUGFIX FOR 18017820 "BISON 3 BREAKS MYSQL BUILD"

Browse Source 
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.
This commit is contained in:
Gleb Shchepa 2014-06-23 19:59:15 +04:00
parent 13d4101a39
commit 01fd5d0d0e
4 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sql/sql_lex.cc
View File

@ -1,5 +1,5 @@
/*
Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights 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
@ -29,7 +29,7 @@
#include "sp.h"
#include "sp_head.h"
static int lex_one_token(void *arg, void *yythd);
static int lex_one_token(YYSTYPE *yylval, THD *thd);
/*
We are using pointer to this variable for distinguishing between assignment
@ -864,16 +864,17 @@ bool consume_comment(Lex_input_stream *lip, int remaining_recursions_permitted)
/*
MYSQLlex remember the following states from the following MYSQLlex()
@param yylval [out] semantic value of the token being parsed (yylval)
@param thd THD
- MY_LEX_EOQ Found end of query
- MY_LEX_OPERATOR_OR_IDENT Last state was an ident, text or number
(which can't be followed by a signed number)
*/
int MYSQLlex(void *arg, void *yythd)
int MYSQLlex(YYSTYPE *yylval, THD *thd)
{
THD *thd= (THD *)yythd;
Lex_input_stream *lip= & thd->m_parser_state->m_lip;
YYSTYPE *yylval=(YYSTYPE*) arg;
int token;
if (lip->lookahead_token >= 0)
@ -889,7 +890,7 @@ int MYSQLlex(void *arg, void *yythd)
return token;
}
token= lex_one_token(arg, yythd);
token= lex_one_token(yylval, thd);
switch(token) {
case WITH:
@ -900,7 +901,7 @@ int MYSQLlex(void *arg, void *yythd)
to transform the grammar into a LALR(1) grammar,
which sql_yacc.yy can process.
*/
token= lex_one_token(arg, yythd);
token= lex_one_token(yylval, thd);
switch(token) {
case CUBE_SYM:
return WITH_CUBE_SYM;
@ -923,17 +924,15 @@ int MYSQLlex(void *arg, void *yythd)
return token;
}
int lex_one_token(void *arg, void *yythd)
static int lex_one_token(YYSTYPE *yylval, THD *thd)
{
reg1 uchar c= 0;
bool comment_closed;
int tokval, result_state;
uint length;
enum my_lex_states state;
THD *thd= (THD *)yythd;
Lex_input_stream *lip= & thd->m_parser_state->m_lip;
LEX *lex= thd->lex;
YYSTYPE *yylval=(YYSTYPE*) arg;
CHARSET_INFO *cs= thd->charset();
uchar *state_map= cs->state_map;
uchar *ident_map= cs->ident_map;

5
sql/sql_lex.h
View File

@ -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);

4
sql/sql_parse.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights 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
@ -7359,7 +7359,7 @@ bool check_host_name(LEX_STRING *str)
}
extern int MYSQLparse(void *thd); // from sql_yacc.cc
extern int MYSQLparse(class THD *thd); // from sql_yacc.cc
/**

18
sql/sql_yacc.yy
View File

@ -22,13 +22,9 @@
*/
%{
/* thd is passed as an argument to yyparse(), and subsequently to yylex().
** The type will be void*, so it must be cast to (THD*) when used.
** Use the YYTHD macro for this.
/*
Note: YYTHD is passed as an argument to yyparse(), and subsequently to yylex().
*/
#define YYPARSE_PARAM yythd
#define YYLEX_PARAM yythd
#define YYTHD ((THD *)yythd)
#define YYLIP (& YYTHD->m_parser_state->m_lip)
#define YYPS (& YYTHD->m_parser_state->m_yacc)
@ -76,7 +72,7 @@ int yylex(void *yylval, void *yythd);
ulong val= *(F); \
if (my_yyoverflow((B), (D), &val)) \
{ \
yyerror((char*) (A)); \
yyerror(YYTHD, (char*) (A)); \
return 2; \
} \
else \
@ -174,10 +170,8 @@ void my_parse_error(const char *s)
to abort from the parser.
*/
void MYSQLerror(const char *s)
void MYSQLerror(THD *thd, const char *s)
{
THD *thd= current_thd;
/*
Restore the original LEX if it was replaced when parsing
a stored procedure. We must ensure that a parsing error
@ -787,7 +781,9 @@ static bool add_create_index (LEX *lex, Key::Keytype type,
bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
%}
%pure_parser /* We have threads */
%parse-param { class THD *YYTHD }
%lex-param { class THD *YYTHD }
%pure-parser /* We have threads */
/*
Currently there are 168 shift/reduce conflicts.
We should not introduce new conflicts any more.