database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2019-04-02 09:19:34 +03:00
parent 8f01a17292 bce380f2a5
commit 7b42d892de
13 changed files with 2394 additions and 1287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/innodb/r/innodb_skip_innodb_is_tables.result
View File

@ -387,7 +387,7 @@ SPACE NAME ENCRYPTION_SCHEME KEYSERVER_REQUESTS MIN_KEY_VERSION CURRENT_KEY_VERS
Warnings: Warnings:
Warning 1012 InnoDB: SELECTing from INFORMATION_SCHEMA.innodb_tablespaces_encryption but the InnoDB storage engine is not installed Warning 1012 InnoDB: SELECTing from INFORMATION_SCHEMA.innodb_tablespaces_encryption but the InnoDB storage engine is not installed
select * from information_schema.innodb_tablespaces_scrubbing; select * from information_schema.innodb_tablespaces_scrubbing;
SPACE NAME COMPRESSED LAST_SCRUB_COMPLETED CURRENT_SCRUB_STARTED CURRENT_SCRUB_ACTIVE_THREADS CURRENT_SCRUB_PAGE_NUMBER CURRENT_SCRUB_MAX_PAGE_NUMBER ROTATING_OR_FLUSHING SPACE NAME COMPRESSED LAST_SCRUB_COMPLETED CURRENT_SCRUB_STARTED CURRENT_SCRUB_ACTIVE_THREADS CURRENT_SCRUB_PAGE_NUMBER CURRENT_SCRUB_MAX_PAGE_NUMBER
Warnings: Warnings:
Warning 1012 InnoDB: SELECTing from INFORMATION_SCHEMA.innodb_tablespaces_scrubbing but the InnoDB storage engine is not installed Warning 1012 InnoDB: SELECTing from INFORMATION_SCHEMA.innodb_tablespaces_scrubbing but the InnoDB storage engine is not installed
select * from information_schema.innodb_mutexes; select * from information_schema.innodb_mutexes;

20
storage/innobase/fts/Makefile.query
View File

@ -9,23 +9,9 @@ fts0blex.cc: fts0blex.l
fts0tlex.cc: fts0tlex.l fts0tlex.cc: fts0tlex.l
.l.cc: .l.cc:
$(LEX) -P$(subst lex,,$*) -o $*.cc --header-file=../include/$*.h $< echo '#include "univ.i"' > $*.cc
$(LEX) --stdout -P$(subst lex,,$*) -o $*.cc \
.y.cc: --header-file=../include/$*.h $< >> $*.cc
$(YACC) -p $(PREFIX) -o $*.cc -d $<
mv $*.h ../include
LEX=flex
YACC=bison
PREFIX=fts
all: fts0pars.cc fts0blex.cc fts0tlex.cc
fts0par.cc: fts0pars.y
fts0blex.cc: fts0blex.l
fts0tlex.cc: fts0tlex.l
.l.cc:
$(LEX) -P$(subst lex,,$*) -o $*.cc --header-file=../include/$*.h $<
.y.cc: .y.cc:
$(YACC) -p $(PREFIX) -o $*.cc -d $< $(YACC) -p $(PREFIX) -o $*.cc -d $<

1105
storage/innobase/fts/fts0blex.cc
View File

File diff suppressed because it is too large Load Diff

1104
storage/innobase/fts/fts0tlex.cc
View File

File diff suppressed because it is too large Load Diff

3
storage/innobase/handler/handler0alter.cc
View File

@ -3282,8 +3282,7 @@ innobase_build_col_map(
== dict_table_get_n_cols(new_table)); == dict_table_get_n_cols(new_table));
DBUG_ASSERT(table->s->stored_fields > 0); DBUG_ASSERT(table->s->stored_fields > 0);
size_t old_n_v_cols = old_n_v_cols = table->s->fields const size_t old_n_v_cols = table->s->fields - table->s->stored_fields;
- table->s->stored_fields;
DBUG_ASSERT(old_n_v_cols == old_table->n_v_cols DBUG_ASSERT(old_n_v_cols == old_table->n_v_cols
|| table->s->frm_version < FRM_VER_EXPRESSSIONS); || table->s->frm_version < FRM_VER_EXPRESSSIONS);
DBUG_ASSERT(!old_n_v_cols || table->s->virtual_fields); DBUG_ASSERT(!old_n_v_cols || table->s->virtual_fields);

9
storage/innobase/handler/i_s.cc
View File

@ -8752,15 +8752,6 @@ static ST_FIELD_INFO innodb_tablespaces_scrubbing_fields_info[] =
STRUCT_FLD(old_name, ""), STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)}, STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
#define TABLESPACES_ENCRYPTION_ROTATING_OR_FLUSHING 9
{STRUCT_FLD(field_name, "ROTATING_OR_FLUSHING"),
STRUCT_FLD(field_length, MY_INT32_NUM_DECIMAL_DIGITS),
STRUCT_FLD(field_type, MYSQL_TYPE_LONG),
STRUCT_FLD(value, 0),
STRUCT_FLD(field_flags, MY_I_S_UNSIGNED),
STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
END_OF_ST_FIELD_INFO END_OF_ST_FIELD_INFO
}; };

465
storage/innobase/include/fts0blex.h
View File

@ -12,12 +12,222 @@
#define FLEX_SCANNER #define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5 #define YY_FLEX_MINOR_VERSION 6
#define YY_FLEX_SUBMINOR_VERSION 35 #define YY_FLEX_SUBMINOR_VERSION 4
#if YY_FLEX_SUBMINOR_VERSION > 0 #if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA #define FLEX_BETA
#endif #endif
#ifdef yy_create_buffer
#define fts0b_create_buffer_ALREADY_DEFINED
#else
#define yy_create_buffer fts0b_create_buffer
#endif
#ifdef yy_delete_buffer
#define fts0b_delete_buffer_ALREADY_DEFINED
#else
#define yy_delete_buffer fts0b_delete_buffer
#endif
#ifdef yy_scan_buffer
#define fts0b_scan_buffer_ALREADY_DEFINED
#else
#define yy_scan_buffer fts0b_scan_buffer
#endif
#ifdef yy_scan_string
#define fts0b_scan_string_ALREADY_DEFINED
#else
#define yy_scan_string fts0b_scan_string
#endif
#ifdef yy_scan_bytes
#define fts0b_scan_bytes_ALREADY_DEFINED
#else
#define yy_scan_bytes fts0b_scan_bytes
#endif
#ifdef yy_init_buffer
#define fts0b_init_buffer_ALREADY_DEFINED
#else
#define yy_init_buffer fts0b_init_buffer
#endif
#ifdef yy_flush_buffer
#define fts0b_flush_buffer_ALREADY_DEFINED
#else
#define yy_flush_buffer fts0b_flush_buffer
#endif
#ifdef yy_load_buffer_state
#define fts0b_load_buffer_state_ALREADY_DEFINED
#else
#define yy_load_buffer_state fts0b_load_buffer_state
#endif
#ifdef yy_switch_to_buffer
#define fts0b_switch_to_buffer_ALREADY_DEFINED
#else
#define yy_switch_to_buffer fts0b_switch_to_buffer
#endif
#ifdef yypush_buffer_state
#define fts0bpush_buffer_state_ALREADY_DEFINED
#else
#define yypush_buffer_state fts0bpush_buffer_state
#endif
#ifdef yypop_buffer_state
#define fts0bpop_buffer_state_ALREADY_DEFINED
#else
#define yypop_buffer_state fts0bpop_buffer_state
#endif
#ifdef yyensure_buffer_stack
#define fts0bensure_buffer_stack_ALREADY_DEFINED
#else
#define yyensure_buffer_stack fts0bensure_buffer_stack
#endif
#ifdef yylex
#define fts0blex_ALREADY_DEFINED
#else
#define yylex fts0blex
#endif
#ifdef yyrestart
#define fts0brestart_ALREADY_DEFINED
#else
#define yyrestart fts0brestart
#endif
#ifdef yylex_init
#define fts0blex_init_ALREADY_DEFINED
#else
#define yylex_init fts0blex_init
#endif
#ifdef yylex_init_extra
#define fts0blex_init_extra_ALREADY_DEFINED
#else
#define yylex_init_extra fts0blex_init_extra
#endif
#ifdef yylex_destroy
#define fts0blex_destroy_ALREADY_DEFINED
#else
#define yylex_destroy fts0blex_destroy
#endif
#ifdef yyget_debug
#define fts0bget_debug_ALREADY_DEFINED
#else
#define yyget_debug fts0bget_debug
#endif
#ifdef yyset_debug
#define fts0bset_debug_ALREADY_DEFINED
#else
#define yyset_debug fts0bset_debug
#endif
#ifdef yyget_extra
#define fts0bget_extra_ALREADY_DEFINED
#else
#define yyget_extra fts0bget_extra
#endif
#ifdef yyset_extra
#define fts0bset_extra_ALREADY_DEFINED
#else
#define yyset_extra fts0bset_extra
#endif
#ifdef yyget_in
#define fts0bget_in_ALREADY_DEFINED
#else
#define yyget_in fts0bget_in
#endif
#ifdef yyset_in
#define fts0bset_in_ALREADY_DEFINED
#else
#define yyset_in fts0bset_in
#endif
#ifdef yyget_out
#define fts0bget_out_ALREADY_DEFINED
#else
#define yyget_out fts0bget_out
#endif
#ifdef yyset_out
#define fts0bset_out_ALREADY_DEFINED
#else
#define yyset_out fts0bset_out
#endif
#ifdef yyget_leng
#define fts0bget_leng_ALREADY_DEFINED
#else
#define yyget_leng fts0bget_leng
#endif
#ifdef yyget_text
#define fts0bget_text_ALREADY_DEFINED
#else
#define yyget_text fts0bget_text
#endif
#ifdef yyget_lineno
#define fts0bget_lineno_ALREADY_DEFINED
#else
#define yyget_lineno fts0bget_lineno
#endif
#ifdef yyset_lineno
#define fts0bset_lineno_ALREADY_DEFINED
#else
#define yyset_lineno fts0bset_lineno
#endif
#ifdef yyget_column
#define fts0bget_column_ALREADY_DEFINED
#else
#define yyget_column fts0bget_column
#endif
#ifdef yyset_column
#define fts0bset_column_ALREADY_DEFINED
#else
#define yyset_column fts0bset_column
#endif
#ifdef yywrap
#define fts0bwrap_ALREADY_DEFINED
#else
#define yywrap fts0bwrap
#endif
#ifdef yyalloc
#define fts0balloc_ALREADY_DEFINED
#else
#define yyalloc fts0balloc
#endif
#ifdef yyrealloc
#define fts0brealloc_ALREADY_DEFINED
#else
#define yyrealloc fts0brealloc
#endif
#ifdef yyfree
#define fts0bfree_ALREADY_DEFINED
#else
#define yyfree fts0bfree
#endif
/* First, we deal with platform-specific or compiler-specific issues. */ /* First, we deal with platform-specific or compiler-specific issues. */
/* begin standard C headers. */ /* begin standard C headers. */
@ -88,29 +298,23 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U) #define UINT32_MAX (4294967295U)
#endif #endif
#ifndef SIZE_MAX
#define SIZE_MAX (~(size_t)0)
#endif
#endif /* ! C99 */ #endif /* ! C99 */
#endif /* ! FLEXINT_H */ #endif /* ! FLEXINT_H */
#ifdef __cplusplus /* begin standard C++ headers. */
/* The "const" storage-class-modifier is valid. */ /* TODO: this is always defined, so inline it */
#define YY_USE_CONST
#else /* ! __cplusplus */
/* C99 requires __STDC__ to be defined as 1. */
#if defined (__STDC__)
#define YY_USE_CONST
#endif /* defined (__STDC__) */
#endif /* ! __cplusplus */
#ifdef YY_USE_CONST
#define yyconst const #define yyconst const
#if defined(__GNUC__) && __GNUC__ >= 3
#define yynoreturn __attribute__((__noreturn__))
#else #else
#define yyconst #define yynoreturn
#endif #endif
/* An opaque pointer. */ /* An opaque pointer. */
@ -165,7 +369,7 @@ struct yy_buffer_state
/* Size of input buffer in bytes, not including room for EOB /* Size of input buffer in bytes, not including room for EOB
* characters. * characters.
*/ */
yy_size_t yy_buf_size; int yy_buf_size;
/* Number of characters read into yy_ch_buf, not including EOB /* Number of characters read into yy_ch_buf, not including EOB
* characters. * characters.
@ -193,7 +397,7 @@ struct yy_buffer_state
int yy_bs_lineno; /**< The line count. */ int yy_bs_lineno; /**< The line count. */
int yy_bs_column; /**< The column count. */ int yy_bs_column; /**< The column count. */
/* Whether to try to fill the input buffer when we reach the /* Whether to try to fill the input buffer when we reach the
* end of it. * end of it.
*/ */
@ -204,25 +408,25 @@ struct yy_buffer_state
}; };
#endif /* !YY_STRUCT_YY_BUFFER_STATE */ #endif /* !YY_STRUCT_YY_BUFFER_STATE */
void fts0brestart (FILE *input_file ,yyscan_t yyscanner ); void yyrestart ( FILE *input_file , yyscan_t yyscanner );
void fts0b_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner );
YY_BUFFER_STATE fts0b_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner );
void fts0b_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner );
void fts0b_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner );
void fts0bpush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner );
void fts0bpop_buffer_state (yyscan_t yyscanner ); void yypop_buffer_state ( yyscan_t yyscanner );
YY_BUFFER_STATE fts0b_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner );
YY_BUFFER_STATE fts0b_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner );
YY_BUFFER_STATE fts0b_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner ); YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner );
void *fts0balloc (yy_size_t ,yyscan_t yyscanner ); void *yyalloc ( yy_size_t , yyscan_t yyscanner );
void *fts0brealloc (void *,yy_size_t ,yyscan_t yyscanner ); void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner );
void fts0bfree (void * ,yyscan_t yyscanner ); void yyfree ( void * , yyscan_t yyscanner );
/* Begin user sect3 */ /* Begin user sect3 */
#define fts0bwrap(n) 1 #define fts0bwrap(yyscanner) (/*CONSTCOND*/1)
#define YY_SKIP_YYWRAP #define YY_SKIP_YYWRAP
#define yytext_ptr yytext_r #define yytext_ptr yytext_r
@ -244,38 +448,42 @@ void fts0bfree (void * ,yyscan_t yyscanner );
#define YY_EXTRA_TYPE void * #define YY_EXTRA_TYPE void *
#endif #endif
int fts0blex_init (yyscan_t* scanner); int yylex_init (yyscan_t* scanner);
int fts0blex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner);
/* Accessor methods to globals. /* Accessor methods to globals.
These are made visible to non-reentrant scanners for convenience. */ These are made visible to non-reentrant scanners for convenience. */
int fts0blex_destroy (yyscan_t yyscanner ); int yylex_destroy ( yyscan_t yyscanner );
int fts0bget_debug (yyscan_t yyscanner ); int yyget_debug ( yyscan_t yyscanner );
void fts0bset_debug (int debug_flag ,yyscan_t yyscanner ); void yyset_debug ( int debug_flag , yyscan_t yyscanner );
YY_EXTRA_TYPE fts0bget_extra (yyscan_t yyscanner ); YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner );
void fts0bset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner );
FILE *fts0bget_in (yyscan_t yyscanner ); FILE *yyget_in ( yyscan_t yyscanner );
void fts0bset_in (FILE * in_str ,yyscan_t yyscanner ); void yyset_in ( FILE * _in_str , yyscan_t yyscanner );
FILE *fts0bget_out (yyscan_t yyscanner ); FILE *yyget_out ( yyscan_t yyscanner );
void fts0bset_out (FILE * out_str ,yyscan_t yyscanner ); void yyset_out ( FILE * _out_str , yyscan_t yyscanner );
int fts0bget_leng (yyscan_t yyscanner ); int yyget_leng ( yyscan_t yyscanner );
char *fts0bget_text (yyscan_t yyscanner ); char *yyget_text ( yyscan_t yyscanner );
int fts0bget_lineno (yyscan_t yyscanner ); int yyget_lineno ( yyscan_t yyscanner );
void fts0bset_lineno (int line_number ,yyscan_t yyscanner ); void yyset_lineno ( int _line_number , yyscan_t yyscanner );
int yyget_column ( yyscan_t yyscanner );
void yyset_column ( int _column_no , yyscan_t yyscanner );
/* Macros after this point can all be overridden by user definitions in /* Macros after this point can all be overridden by user definitions in
* section 1. * section 1.
@ -283,18 +491,18 @@ void fts0bset_lineno (int line_number ,yyscan_t yyscanner );
#ifndef YY_SKIP_YYWRAP #ifndef YY_SKIP_YYWRAP
#ifdef __cplusplus #ifdef __cplusplus
extern "C" int fts0bwrap (yyscan_t yyscanner ); extern "C" int yywrap ( yyscan_t yyscanner );
#else #else
extern int fts0bwrap (yyscan_t yyscanner ); extern int yywrap ( yyscan_t yyscanner );
#endif #endif
#endif #endif
#ifndef yytext_ptr #ifndef yytext_ptr
static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner);
#endif #endif
#ifdef YY_NEED_STRLEN #ifdef YY_NEED_STRLEN
static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); static int yy_flex_strlen ( const char * , yyscan_t yyscanner);
#endif #endif
#ifndef YY_NO_INPUT #ifndef YY_NO_INPUT
@ -322,9 +530,9 @@ static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
#ifndef YY_DECL #ifndef YY_DECL
#define YY_DECL_IS_OURS 1 #define YY_DECL_IS_OURS 1
extern int fts0blex (yyscan_t yyscanner); extern int yylex (yyscan_t yyscanner);
#define YY_DECL int fts0blex (yyscan_t yyscanner) #define YY_DECL int yylex (yyscan_t yyscanner)
#endif /* !YY_DECL */ #endif /* !YY_DECL */
/* yy_get_previous_state - get the state just before the EOB char was reached */ /* yy_get_previous_state - get the state just before the EOB char was reached */
@ -341,9 +549,154 @@ extern int fts0blex (yyscan_t yyscanner);
#undef YY_DECL #undef YY_DECL
#endif #endif
#ifndef fts0b_create_buffer_ALREADY_DEFINED
#undef yy_create_buffer
#endif
#ifndef fts0b_delete_buffer_ALREADY_DEFINED
#undef yy_delete_buffer
#endif
#ifndef fts0b_scan_buffer_ALREADY_DEFINED
#undef yy_scan_buffer
#endif
#ifndef fts0b_scan_string_ALREADY_DEFINED
#undef yy_scan_string
#endif
#ifndef fts0b_scan_bytes_ALREADY_DEFINED
#undef yy_scan_bytes
#endif
#ifndef fts0b_init_buffer_ALREADY_DEFINED
#undef yy_init_buffer
#endif
#ifndef fts0b_flush_buffer_ALREADY_DEFINED
#undef yy_flush_buffer
#endif
#ifndef fts0b_load_buffer_state_ALREADY_DEFINED
#undef yy_load_buffer_state
#endif
#ifndef fts0b_switch_to_buffer_ALREADY_DEFINED
#undef yy_switch_to_buffer
#endif
#ifndef fts0bpush_buffer_state_ALREADY_DEFINED
#undef yypush_buffer_state
#endif
#ifndef fts0bpop_buffer_state_ALREADY_DEFINED
#undef yypop_buffer_state
#endif
#ifndef fts0bensure_buffer_stack_ALREADY_DEFINED
#undef yyensure_buffer_stack
#endif
#ifndef fts0blex_ALREADY_DEFINED
#undef yylex
#endif
#ifndef fts0brestart_ALREADY_DEFINED
#undef yyrestart
#endif
#ifndef fts0blex_init_ALREADY_DEFINED
#undef yylex_init
#endif
#ifndef fts0blex_init_extra_ALREADY_DEFINED
#undef yylex_init_extra
#endif
#ifndef fts0blex_destroy_ALREADY_DEFINED
#undef yylex_destroy
#endif
#ifndef fts0bget_debug_ALREADY_DEFINED
#undef yyget_debug
#endif
#ifndef fts0bset_debug_ALREADY_DEFINED
#undef yyset_debug
#endif
#ifndef fts0bget_extra_ALREADY_DEFINED
#undef yyget_extra
#endif
#ifndef fts0bset_extra_ALREADY_DEFINED
#undef yyset_extra
#endif
#ifndef fts0bget_in_ALREADY_DEFINED
#undef yyget_in
#endif
#ifndef fts0bset_in_ALREADY_DEFINED
#undef yyset_in
#endif
#ifndef fts0bget_out_ALREADY_DEFINED
#undef yyget_out
#endif
#ifndef fts0bset_out_ALREADY_DEFINED
#undef yyset_out
#endif
#ifndef fts0bget_leng_ALREADY_DEFINED
#undef yyget_leng
#endif
#ifndef fts0bget_text_ALREADY_DEFINED
#undef yyget_text
#endif
#ifndef fts0bget_lineno_ALREADY_DEFINED
#undef yyget_lineno
#endif
#ifndef fts0bset_lineno_ALREADY_DEFINED
#undef yyset_lineno
#endif
#ifndef fts0bget_column_ALREADY_DEFINED
#undef yyget_column
#endif
#ifndef fts0bset_column_ALREADY_DEFINED
#undef yyset_column
#endif
#ifndef fts0bwrap_ALREADY_DEFINED
#undef yywrap
#endif
#ifndef fts0bget_lval_ALREADY_DEFINED
#undef yyget_lval
#endif
#ifndef fts0bset_lval_ALREADY_DEFINED
#undef yyset_lval
#endif
#ifndef fts0bget_lloc_ALREADY_DEFINED
#undef yyget_lloc
#endif
#ifndef fts0bset_lloc_ALREADY_DEFINED
#undef yyset_lloc
#endif
#ifndef fts0balloc_ALREADY_DEFINED
#undef yyalloc
#endif
#ifndef fts0brealloc_ALREADY_DEFINED
#undef yyrealloc
#endif
#ifndef fts0bfree_ALREADY_DEFINED
#undef yyfree
#endif
#ifndef fts0btext_ALREADY_DEFINED
#undef yytext
#endif
#ifndef fts0bleng_ALREADY_DEFINED
#undef yyleng
#endif
#ifndef fts0bin_ALREADY_DEFINED
#undef yyin
#endif
#ifndef fts0bout_ALREADY_DEFINED
#undef yyout
#endif
#ifndef fts0b_flex_debug_ALREADY_DEFINED
#undef yy_flex_debug
#endif
#ifndef fts0blineno_ALREADY_DEFINED
#undef yylineno
#endif
#ifndef fts0btables_fload_ALREADY_DEFINED
#undef yytables_fload
#endif
#ifndef fts0btables_destroy_ALREADY_DEFINED
#undef yytables_destroy
#endif
#ifndef fts0bTABLES_NAME_ALREADY_DEFINED
#undef yyTABLES_NAME
#endif
#line 74 "fts0blex.l" #line 74 "fts0blex.l"
#line 348 "../include/fts0blex.h" #line 701 "../include/fts0blex.h"
#undef fts0bIN_HEADER #undef fts0bIN_HEADER
#endif /* fts0bHEADER_H */ #endif /* fts0bHEADER_H */

465
storage/innobase/include/fts0tlex.h
View File

@ -12,12 +12,222 @@
#define FLEX_SCANNER #define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5 #define YY_FLEX_MINOR_VERSION 6
#define YY_FLEX_SUBMINOR_VERSION 35 #define YY_FLEX_SUBMINOR_VERSION 4
#if YY_FLEX_SUBMINOR_VERSION > 0 #if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA #define FLEX_BETA
#endif #endif
#ifdef yy_create_buffer
#define fts0t_create_buffer_ALREADY_DEFINED
#else
#define yy_create_buffer fts0t_create_buffer
#endif
#ifdef yy_delete_buffer
#define fts0t_delete_buffer_ALREADY_DEFINED
#else
#define yy_delete_buffer fts0t_delete_buffer
#endif
#ifdef yy_scan_buffer
#define fts0t_scan_buffer_ALREADY_DEFINED
#else
#define yy_scan_buffer fts0t_scan_buffer
#endif
#ifdef yy_scan_string
#define fts0t_scan_string_ALREADY_DEFINED
#else
#define yy_scan_string fts0t_scan_string
#endif
#ifdef yy_scan_bytes
#define fts0t_scan_bytes_ALREADY_DEFINED
#else
#define yy_scan_bytes fts0t_scan_bytes
#endif
#ifdef yy_init_buffer
#define fts0t_init_buffer_ALREADY_DEFINED
#else
#define yy_init_buffer fts0t_init_buffer
#endif
#ifdef yy_flush_buffer
#define fts0t_flush_buffer_ALREADY_DEFINED
#else
#define yy_flush_buffer fts0t_flush_buffer
#endif
#ifdef yy_load_buffer_state
#define fts0t_load_buffer_state_ALREADY_DEFINED
#else
#define yy_load_buffer_state fts0t_load_buffer_state
#endif
#ifdef yy_switch_to_buffer
#define fts0t_switch_to_buffer_ALREADY_DEFINED
#else
#define yy_switch_to_buffer fts0t_switch_to_buffer
#endif
#ifdef yypush_buffer_state
#define fts0tpush_buffer_state_ALREADY_DEFINED
#else
#define yypush_buffer_state fts0tpush_buffer_state
#endif
#ifdef yypop_buffer_state
#define fts0tpop_buffer_state_ALREADY_DEFINED
#else
#define yypop_buffer_state fts0tpop_buffer_state
#endif
#ifdef yyensure_buffer_stack
#define fts0tensure_buffer_stack_ALREADY_DEFINED
#else
#define yyensure_buffer_stack fts0tensure_buffer_stack
#endif
#ifdef yylex
#define fts0tlex_ALREADY_DEFINED
#else
#define yylex fts0tlex
#endif
#ifdef yyrestart
#define fts0trestart_ALREADY_DEFINED
#else
#define yyrestart fts0trestart
#endif
#ifdef yylex_init
#define fts0tlex_init_ALREADY_DEFINED
#else
#define yylex_init fts0tlex_init
#endif
#ifdef yylex_init_extra
#define fts0tlex_init_extra_ALREADY_DEFINED
#else
#define yylex_init_extra fts0tlex_init_extra
#endif
#ifdef yylex_destroy
#define fts0tlex_destroy_ALREADY_DEFINED
#else
#define yylex_destroy fts0tlex_destroy
#endif
#ifdef yyget_debug
#define fts0tget_debug_ALREADY_DEFINED
#else
#define yyget_debug fts0tget_debug
#endif
#ifdef yyset_debug
#define fts0tset_debug_ALREADY_DEFINED
#else
#define yyset_debug fts0tset_debug
#endif
#ifdef yyget_extra
#define fts0tget_extra_ALREADY_DEFINED
#else
#define yyget_extra fts0tget_extra
#endif
#ifdef yyset_extra
#define fts0tset_extra_ALREADY_DEFINED
#else
#define yyset_extra fts0tset_extra
#endif
#ifdef yyget_in
#define fts0tget_in_ALREADY_DEFINED
#else
#define yyget_in fts0tget_in
#endif
#ifdef yyset_in
#define fts0tset_in_ALREADY_DEFINED
#else
#define yyset_in fts0tset_in
#endif
#ifdef yyget_out
#define fts0tget_out_ALREADY_DEFINED
#else
#define yyget_out fts0tget_out
#endif
#ifdef yyset_out
#define fts0tset_out_ALREADY_DEFINED
#else
#define yyset_out fts0tset_out
#endif
#ifdef yyget_leng
#define fts0tget_leng_ALREADY_DEFINED
#else
#define yyget_leng fts0tget_leng
#endif
#ifdef yyget_text
#define fts0tget_text_ALREADY_DEFINED
#else
#define yyget_text fts0tget_text
#endif
#ifdef yyget_lineno
#define fts0tget_lineno_ALREADY_DEFINED
#else
#define yyget_lineno fts0tget_lineno
#endif
#ifdef yyset_lineno
#define fts0tset_lineno_ALREADY_DEFINED
#else
#define yyset_lineno fts0tset_lineno
#endif
#ifdef yyget_column
#define fts0tget_column_ALREADY_DEFINED
#else
#define yyget_column fts0tget_column
#endif
#ifdef yyset_column
#define fts0tset_column_ALREADY_DEFINED
#else
#define yyset_column fts0tset_column
#endif
#ifdef yywrap
#define fts0twrap_ALREADY_DEFINED
#else
#define yywrap fts0twrap
#endif
#ifdef yyalloc
#define fts0talloc_ALREADY_DEFINED
#else
#define yyalloc fts0talloc
#endif
#ifdef yyrealloc
#define fts0trealloc_ALREADY_DEFINED
#else
#define yyrealloc fts0trealloc
#endif
#ifdef yyfree
#define fts0tfree_ALREADY_DEFINED
#else
#define yyfree fts0tfree
#endif
/* First, we deal with platform-specific or compiler-specific issues. */ /* First, we deal with platform-specific or compiler-specific issues. */
/* begin standard C headers. */ /* begin standard C headers. */
@ -88,29 +298,23 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U) #define UINT32_MAX (4294967295U)
#endif #endif
#ifndef SIZE_MAX
#define SIZE_MAX (~(size_t)0)
#endif
#endif /* ! C99 */ #endif /* ! C99 */
#endif /* ! FLEXINT_H */ #endif /* ! FLEXINT_H */
#ifdef __cplusplus /* begin standard C++ headers. */
/* The "const" storage-class-modifier is valid. */ /* TODO: this is always defined, so inline it */
#define YY_USE_CONST
#else /* ! __cplusplus */
/* C99 requires __STDC__ to be defined as 1. */
#if defined (__STDC__)
#define YY_USE_CONST
#endif /* defined (__STDC__) */
#endif /* ! __cplusplus */
#ifdef YY_USE_CONST
#define yyconst const #define yyconst const
#if defined(__GNUC__) && __GNUC__ >= 3
#define yynoreturn __attribute__((__noreturn__))
#else #else
#define yyconst #define yynoreturn
#endif #endif
/* An opaque pointer. */ /* An opaque pointer. */
@ -165,7 +369,7 @@ struct yy_buffer_state
/* Size of input buffer in bytes, not including room for EOB /* Size of input buffer in bytes, not including room for EOB
* characters. * characters.
*/ */
yy_size_t yy_buf_size; int yy_buf_size;
/* Number of characters read into yy_ch_buf, not including EOB /* Number of characters read into yy_ch_buf, not including EOB
* characters. * characters.
@ -193,7 +397,7 @@ struct yy_buffer_state
int yy_bs_lineno; /**< The line count. */ int yy_bs_lineno; /**< The line count. */
int yy_bs_column; /**< The column count. */ int yy_bs_column; /**< The column count. */
/* Whether to try to fill the input buffer when we reach the /* Whether to try to fill the input buffer when we reach the
* end of it. * end of it.
*/ */
@ -204,25 +408,25 @@ struct yy_buffer_state
}; };
#endif /* !YY_STRUCT_YY_BUFFER_STATE */ #endif /* !YY_STRUCT_YY_BUFFER_STATE */
void fts0trestart (FILE *input_file ,yyscan_t yyscanner ); void yyrestart ( FILE *input_file , yyscan_t yyscanner );
void fts0t_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner );
YY_BUFFER_STATE fts0t_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner );
void fts0t_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner );
void fts0t_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner );
void fts0tpush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner );
void fts0tpop_buffer_state (yyscan_t yyscanner ); void yypop_buffer_state ( yyscan_t yyscanner );
YY_BUFFER_STATE fts0t_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner );
YY_BUFFER_STATE fts0t_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner );
YY_BUFFER_STATE fts0t_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner ); YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner );
void *fts0talloc (yy_size_t ,yyscan_t yyscanner ); void *yyalloc ( yy_size_t , yyscan_t yyscanner );
void *fts0trealloc (void *,yy_size_t ,yyscan_t yyscanner ); void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner );
void fts0tfree (void * ,yyscan_t yyscanner ); void yyfree ( void * , yyscan_t yyscanner );
/* Begin user sect3 */ /* Begin user sect3 */
#define fts0twrap(n) 1 #define fts0twrap(yyscanner) (/*CONSTCOND*/1)
#define YY_SKIP_YYWRAP #define YY_SKIP_YYWRAP
#define yytext_ptr yytext_r #define yytext_ptr yytext_r
@ -244,38 +448,42 @@ void fts0tfree (void * ,yyscan_t yyscanner );
#define YY_EXTRA_TYPE void * #define YY_EXTRA_TYPE void *
#endif #endif
int fts0tlex_init (yyscan_t* scanner); int yylex_init (yyscan_t* scanner);
int fts0tlex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner);
/* Accessor methods to globals. /* Accessor methods to globals.
These are made visible to non-reentrant scanners for convenience. */ These are made visible to non-reentrant scanners for convenience. */
int fts0tlex_destroy (yyscan_t yyscanner ); int yylex_destroy ( yyscan_t yyscanner );
int fts0tget_debug (yyscan_t yyscanner ); int yyget_debug ( yyscan_t yyscanner );
void fts0tset_debug (int debug_flag ,yyscan_t yyscanner ); void yyset_debug ( int debug_flag , yyscan_t yyscanner );
YY_EXTRA_TYPE fts0tget_extra (yyscan_t yyscanner ); YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner );
void fts0tset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner );
FILE *fts0tget_in (yyscan_t yyscanner ); FILE *yyget_in ( yyscan_t yyscanner );
void fts0tset_in (FILE * in_str ,yyscan_t yyscanner ); void yyset_in ( FILE * _in_str , yyscan_t yyscanner );
FILE *fts0tget_out (yyscan_t yyscanner ); FILE *yyget_out ( yyscan_t yyscanner );
void fts0tset_out (FILE * out_str ,yyscan_t yyscanner ); void yyset_out ( FILE * _out_str , yyscan_t yyscanner );
int fts0tget_leng (yyscan_t yyscanner ); int yyget_leng ( yyscan_t yyscanner );
char *fts0tget_text (yyscan_t yyscanner ); char *yyget_text ( yyscan_t yyscanner );
int fts0tget_lineno (yyscan_t yyscanner ); int yyget_lineno ( yyscan_t yyscanner );
void fts0tset_lineno (int line_number ,yyscan_t yyscanner ); void yyset_lineno ( int _line_number , yyscan_t yyscanner );
int yyget_column ( yyscan_t yyscanner );
void yyset_column ( int _column_no , yyscan_t yyscanner );
/* Macros after this point can all be overridden by user definitions in /* Macros after this point can all be overridden by user definitions in
* section 1. * section 1.
@ -283,18 +491,18 @@ void fts0tset_lineno (int line_number ,yyscan_t yyscanner );
#ifndef YY_SKIP_YYWRAP #ifndef YY_SKIP_YYWRAP
#ifdef __cplusplus #ifdef __cplusplus
extern "C" int fts0twrap (yyscan_t yyscanner ); extern "C" int yywrap ( yyscan_t yyscanner );
#else #else
extern int fts0twrap (yyscan_t yyscanner ); extern int yywrap ( yyscan_t yyscanner );
#endif #endif
#endif #endif
#ifndef yytext_ptr #ifndef yytext_ptr
static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner);
#endif #endif
#ifdef YY_NEED_STRLEN #ifdef YY_NEED_STRLEN
static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); static int yy_flex_strlen ( const char * , yyscan_t yyscanner);
#endif #endif
#ifndef YY_NO_INPUT #ifndef YY_NO_INPUT
@ -322,9 +530,9 @@ static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
#ifndef YY_DECL #ifndef YY_DECL
#define YY_DECL_IS_OURS 1 #define YY_DECL_IS_OURS 1
extern int fts0tlex (yyscan_t yyscanner); extern int yylex (yyscan_t yyscanner);
#define YY_DECL int fts0tlex (yyscan_t yyscanner) #define YY_DECL int yylex (yyscan_t yyscanner)
#endif /* !YY_DECL */ #endif /* !YY_DECL */
/* yy_get_previous_state - get the state just before the EOB char was reached */ /* yy_get_previous_state - get the state just before the EOB char was reached */
@ -341,9 +549,154 @@ extern int fts0tlex (yyscan_t yyscanner);
#undef YY_DECL #undef YY_DECL
#endif #endif
#ifndef fts0t_create_buffer_ALREADY_DEFINED
#undef yy_create_buffer
#endif
#ifndef fts0t_delete_buffer_ALREADY_DEFINED
#undef yy_delete_buffer
#endif
#ifndef fts0t_scan_buffer_ALREADY_DEFINED
#undef yy_scan_buffer
#endif
#ifndef fts0t_scan_string_ALREADY_DEFINED
#undef yy_scan_string
#endif
#ifndef fts0t_scan_bytes_ALREADY_DEFINED
#undef yy_scan_bytes
#endif
#ifndef fts0t_init_buffer_ALREADY_DEFINED
#undef yy_init_buffer
#endif
#ifndef fts0t_flush_buffer_ALREADY_DEFINED
#undef yy_flush_buffer
#endif
#ifndef fts0t_load_buffer_state_ALREADY_DEFINED
#undef yy_load_buffer_state
#endif
#ifndef fts0t_switch_to_buffer_ALREADY_DEFINED
#undef yy_switch_to_buffer
#endif
#ifndef fts0tpush_buffer_state_ALREADY_DEFINED
#undef yypush_buffer_state
#endif
#ifndef fts0tpop_buffer_state_ALREADY_DEFINED
#undef yypop_buffer_state
#endif
#ifndef fts0tensure_buffer_stack_ALREADY_DEFINED
#undef yyensure_buffer_stack
#endif
#ifndef fts0tlex_ALREADY_DEFINED
#undef yylex
#endif
#ifndef fts0trestart_ALREADY_DEFINED
#undef yyrestart
#endif
#ifndef fts0tlex_init_ALREADY_DEFINED
#undef yylex_init
#endif
#ifndef fts0tlex_init_extra_ALREADY_DEFINED
#undef yylex_init_extra
#endif
#ifndef fts0tlex_destroy_ALREADY_DEFINED
#undef yylex_destroy
#endif
#ifndef fts0tget_debug_ALREADY_DEFINED
#undef yyget_debug
#endif
#ifndef fts0tset_debug_ALREADY_DEFINED
#undef yyset_debug
#endif
#ifndef fts0tget_extra_ALREADY_DEFINED
#undef yyget_extra
#endif
#ifndef fts0tset_extra_ALREADY_DEFINED
#undef yyset_extra
#endif
#ifndef fts0tget_in_ALREADY_DEFINED
#undef yyget_in
#endif
#ifndef fts0tset_in_ALREADY_DEFINED
#undef yyset_in
#endif
#ifndef fts0tget_out_ALREADY_DEFINED
#undef yyget_out
#endif
#ifndef fts0tset_out_ALREADY_DEFINED
#undef yyset_out
#endif
#ifndef fts0tget_leng_ALREADY_DEFINED
#undef yyget_leng
#endif
#ifndef fts0tget_text_ALREADY_DEFINED
#undef yyget_text
#endif
#ifndef fts0tget_lineno_ALREADY_DEFINED
#undef yyget_lineno
#endif
#ifndef fts0tset_lineno_ALREADY_DEFINED
#undef yyset_lineno
#endif
#ifndef fts0tget_column_ALREADY_DEFINED
#undef yyget_column
#endif
#ifndef fts0tset_column_ALREADY_DEFINED
#undef yyset_column
#endif
#ifndef fts0twrap_ALREADY_DEFINED
#undef yywrap
#endif
#ifndef fts0tget_lval_ALREADY_DEFINED
#undef yyget_lval
#endif
#ifndef fts0tset_lval_ALREADY_DEFINED
#undef yyset_lval
#endif
#ifndef fts0tget_lloc_ALREADY_DEFINED
#undef yyget_lloc
#endif
#ifndef fts0tset_lloc_ALREADY_DEFINED
#undef yyset_lloc
#endif
#ifndef fts0talloc_ALREADY_DEFINED
#undef yyalloc
#endif
#ifndef fts0trealloc_ALREADY_DEFINED
#undef yyrealloc
#endif
#ifndef fts0tfree_ALREADY_DEFINED
#undef yyfree
#endif
#ifndef fts0ttext_ALREADY_DEFINED
#undef yytext
#endif
#ifndef fts0tleng_ALREADY_DEFINED
#undef yyleng
#endif
#ifndef fts0tin_ALREADY_DEFINED
#undef yyin
#endif
#ifndef fts0tout_ALREADY_DEFINED
#undef yyout
#endif
#ifndef fts0t_flex_debug_ALREADY_DEFINED
#undef yy_flex_debug
#endif
#ifndef fts0tlineno_ALREADY_DEFINED
#undef yylineno
#endif
#ifndef fts0ttables_fload_ALREADY_DEFINED
#undef yytables_fload
#endif
#ifndef fts0ttables_destroy_ALREADY_DEFINED
#undef yytables_destroy
#endif
#ifndef fts0tTABLES_NAME_ALREADY_DEFINED
#undef yyTABLES_NAME
#endif
#line 69 "fts0tlex.l" #line 69 "fts0tlex.l"
#line 348 "../include/fts0tlex.h" #line 701 "../include/fts0tlex.h"
#undef fts0tIN_HEADER #undef fts0tIN_HEADER
#endif /* fts0tHEADER_H */ #endif /* fts0tHEADER_H */

6
storage/innobase/include/pars0pars.h
View File

@ -1,7 +1,7 @@
/***************************************************************************** /*****************************************************************************
Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2017, 2018, MariaDB Corporation. Copyright (c) 2017, 2019, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under 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 the Free Software the terms of the GNU General Public License as published by the Free Software
@ -101,11 +101,11 @@ pars_sql(
/*************************************************************//** /*************************************************************//**
Retrieves characters to the lexical analyzer. Retrieves characters to the lexical analyzer.
@return number of characters copied or 0 on EOF */ @return number of characters copied or 0 on EOF */
int size_t
pars_get_lex_chars( pars_get_lex_chars(
/*===============*/ /*===============*/
char* buf, /*!< in/out: buffer where to copy */ char* buf, /*!< in/out: buffer where to copy */
int max_size); /*!< in: maximum number of characters which fit size_t max_size); /*!< in: maximum number of characters which fit
in the buffer */ in the buffer */
/*************************************************************//** /*************************************************************//**
Called by yyparse on error. */ Called by yyparse on error. */

477
storage/innobase/pars/lexyy.cc
View File

File diff suppressed because it is too large Load Diff

7
storage/innobase/pars/make_flex.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# #
# Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. # Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved.
# Copyright (c) 2017, MariaDB Corporation. # Copyright (c) 2017, 2019, MariaDB Corporation.
# #
# This program is free software; you can redistribute it and/or modify it under # 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 the Free Software # the terms of the GNU General Public License as published by the Free Software
@ -24,15 +24,14 @@ OUTFILE=lexyy.cc
flex -o $TMPFILE pars0lex.l flex -o $TMPFILE pars0lex.l
# AIX needs its includes done in a certain order, so include "univ.i" first # The Microsoft compiler needs its includes done in a certain order.
# to be sure we get it right.
echo '#include "univ.i"' > $OUTFILE echo '#include "univ.i"' > $OUTFILE
# flex assigns a pointer to an int in one place without a cast, resulting in # flex assigns a pointer to an int in one place without a cast, resulting in
# a warning on Win64. Add the cast. Also define some symbols as static. # a warning on Win64. Add the cast. Also define some symbols as static.
sed -e ' sed -e '
s/'"$TMPFILE"'/'"$OUTFILE"'/; s/'"$TMPFILE"'/'"$OUTFILE"'/;
s/^void yyset_extra *(YY_EXTRA_TYPE *user_defined *);// s/^void *yyset_extra *( *YY_EXTRA_TYPE *user_defined *) *;//
s/\(int offset = \)\((yy_c_buf_p) - (yytext_ptr)\);/\1(int)(\2);/; s/\(int offset = \)\((yy_c_buf_p) - (yytext_ptr)\);/\1(int)(\2);/;
s/\(void yy\(restart\|_\(delete\|flush\)_buffer\)\)/static \1/; s/\(void yy\(restart\|_\(delete\|flush\)_buffer\)\)/static \1/;
s/\(void yy_switch_to_buffer\)/MY_ATTRIBUTE((unused)) static \1/; s/\(void yy_switch_to_buffer\)/MY_ATTRIBUTE((unused)) static \1/;

5
storage/innobase/pars/pars0lex.l
View File

@ -1,7 +1,7 @@
/***************************************************************************** /*****************************************************************************
Copyright (c) 1997, 2014, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 1997, 2014, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2017, MariaDB Corporation. Copyright (c) 2017, 2019, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under 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 the Free Software the terms of the GNU General Public License as published by the Free Software
@ -65,9 +65,8 @@ Created 12/14/1997 Heikki Tuuri
#define realloc(P, A) ut_realloc(P, A) #define realloc(P, A) ut_realloc(P, A)
#define exit(A) ut_error #define exit(A) ut_error
/* Note: We cast &result to int* from yysize_t* */
#define YY_INPUT(buf, result, max_size) \ #define YY_INPUT(buf, result, max_size) \
(result = pars_get_lex_chars(buf, max_size)) result = pars_get_lex_chars(buf, max_size)
/* String buffer for removing quotes */ /* String buffer for removing quotes */
static ulint stringbuf_len_alloc = 0; /* Allocated length */ static ulint stringbuf_len_alloc = 0; /* Allocated length */

13
storage/innobase/pars/pars0pars.cc
View File

@ -1,7 +1,7 @@
/***************************************************************************** /*****************************************************************************
Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2018, MariaDB Corporation. Copyright (c) 2018, 2019, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under 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 the Free Software the terms of the GNU General Public License as published by the Free Software
@ -2062,17 +2062,16 @@ pars_stored_procedure_call(
/*************************************************************//** /*************************************************************//**
Retrieves characters to the lexical analyzer. */ Retrieves characters to the lexical analyzer. */
int size_t
pars_get_lex_chars( pars_get_lex_chars(
/*===============*/ /*===============*/
char* buf, /*!< in/out: buffer where to copy */ char* buf, /*!< in/out: buffer where to copy */
int max_size) /*!< in: maximum number of characters which fit size_t max_size) /*!< in: maximum number of characters which fit
in the buffer */ in the buffer */
{ {
int len; size_t len = size_t(
pars_sym_tab_global->string_len
len = int(pars_sym_tab_global->string_len) - pars_sym_tab_global->next_char_pos);
- pars_sym_tab_global->next_char_pos;
if (len == 0) { if (len == 0) {
return(0); return(0);
} }