mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

followup: rename generated files to have distinct names

Browse source
This commit is contained in:
Sergei Golubchik 2021-05-23 18:38:46 +02:00
parent dfbeddaa11
commit 4777097fee
12 changed files with 48 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.gitignore vendored
View file

@ -196,12 +196,12 @@ sql/lex_hash.h
sql/mysql_tzinfo_to_sql sql/mysql_tzinfo_to_sql
sql/mysqld sql/mysqld
sql/sql_builtin.cc sql/sql_builtin.cc
sql/sql_yacc.cc sql/yy_mariadb.cc
sql/sql_yacc.hh sql/yy_mariadb.hh
sql/sql_yacc_mariadb.yy sql/yy_mariadb.yy
sql/sql_yacc_ora.cc sql/yy_oracle.cc
sql/sql_yacc_ora.hh sql/yy_oracle.hh
sql/sql_yacc_ora.yy sql/yy_oracle.yy
storage/heap/hp_test1 storage/heap/hp_test1
storage/heap/hp_test2 storage/heap/hp_test2
storage/maria/aria_chk storage/maria/aria_chk

16
cmake/make_dist.cmake.in
View file

@ -125,15 +125,15 @@ IF(NOT GIT_EXECUTABLE)
ENDIF() ENDIF()
# Copy bison output # Copy bison output
CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/sql_yacc.hh CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/yy_mariadb.hh
${PACKAGE_DIR}/sql/sql_yacc.hh COPYONLY) ${PACKAGE_DIR}/sql/yy_mariadb.hh COPYONLY)
CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/sql_yacc.cc CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/yy_mariadb.cc
${PACKAGE_DIR}/sql/sql_yacc.cc COPYONLY) ${PACKAGE_DIR}/sql/yy_mariadb.cc COPYONLY)
# Copy bison output # Copy bison output
CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/sql_yacc_ora.hh CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/yy_oracle.hh
${PACKAGE_DIR}/sql/sql_yacc_ora.hh COPYONLY) ${PACKAGE_DIR}/sql/yy_oracle.hh COPYONLY)
CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/sql_yacc_ora.cc CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/yy_oracle.cc
${PACKAGE_DIR}/sql/sql_yacc_ora.cc COPYONLY) ${PACKAGE_DIR}/sql/yy_oracle.cc COPYONLY)
# Add documentation, if user has specified where to find them # Add documentation, if user has specified where to find them
IF(MYSQL_DOCS_LOCATION) IF(MYSQL_DOCS_LOCATION)

6
libmysqld/CMakeLists.txt
View file

@ -31,9 +31,9 @@ ${SSL_INTERNAL_INCLUDE_DIRS}
SET(GEN_SOURCES SET(GEN_SOURCES
${CMAKE_BINARY_DIR}/sql/sql_yacc.hh ${CMAKE_BINARY_DIR}/sql/sql_yacc.hh
${CMAKE_BINARY_DIR}/sql/sql_yacc.cc ${CMAKE_BINARY_DIR}/sql/yy_mariadb.cc
${CMAKE_BINARY_DIR}/sql/sql_yacc_ora.hh ${CMAKE_BINARY_DIR}/sql/yy_oracle.hh
${CMAKE_BINARY_DIR}/sql/sql_yacc_ora.cc ${CMAKE_BINARY_DIR}/sql/yy_oracle.cc
${CMAKE_BINARY_DIR}/sql/lex_hash.h ${CMAKE_BINARY_DIR}/sql/lex_hash.h
) )

36
sql/CMakeLists.txt
View file

@ -66,13 +66,14 @@ ADD_CUSTOM_COMMAND(
) )
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc_mariadb.yy OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/yy_mariadb.yy
${CMAKE_CURRENT_BINARY_DIR}/sql_yacc_ora.yy ${CMAKE_CURRENT_BINARY_DIR}/yy_oracle.yy
COMMAND ${CMAKE_COMMAND} "-DVAL1=ORACLE" "-DVAL2=MARIADB" COMMAND ${CMAKE_COMMAND} "-DVAL1=ORACLE" "-DVAL2=MARIADB"
"-DOUT1=${CMAKE_CURRENT_BINARY_DIR}/sql_yacc_ora.yy" "-DOUT1=${CMAKE_CURRENT_BINARY_DIR}/yy_oracle.yy"
"-DOUT2=${CMAKE_CURRENT_BINARY_DIR}/sql_yacc_mariadb.yy" "-DOUT2=${CMAKE_CURRENT_BINARY_DIR}/yy_mariadb.yy"
"-DIN=${CMAKE_CURRENT_SOURCE_DIR}/sql_yacc.yy" "-DIN=${CMAKE_CURRENT_SOURCE_DIR}/sql_yacc.yy"
-P ${CMAKE_CURRENT_SOURCE_DIR}/gen_yy_files.cmake -P ${CMAKE_CURRENT_SOURCE_DIR}/gen_yy_files.cmake
COMMENT "Building yy_mariadb.yy and yy_oracle.yy from sql_yacc.yy"
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/sql_yacc.yy DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/sql_yacc.yy
${CMAKE_CURRENT_SOURCE_DIR}/gen_yy_files.cmake ${CMAKE_CURRENT_SOURCE_DIR}/gen_yy_files.cmake
) )
@ -84,8 +85,8 @@ IF(SSL_DEFINES)
ENDIF() ENDIF()
SET (SQL_SOURCE SET (SQL_SOURCE
${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.cc ${CMAKE_CURRENT_BINARY_DIR}/yy_mariadb.cc
${CMAKE_CURRENT_BINARY_DIR}/sql_yacc_ora.cc ${CMAKE_CURRENT_BINARY_DIR}/yy_oracle.cc
../sql-common/client.c compat56.cc derror.cc des_key_file.cc ../sql-common/client.c compat56.cc derror.cc des_key_file.cc
discover.cc ../sql-common/errmsg.c discover.cc ../sql-common/errmsg.c
field.cc field_conv.cc field_comp.cc field.cc field_conv.cc field_comp.cc
@ -328,7 +329,7 @@ FIND_PACKAGE(BISON 2.0)
# there # there
IF (NOT BISON_FOUND) IF (NOT BISON_FOUND)
IF (NOT ${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR}) IF (NOT ${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR})
FOREACH(file sql_yacc.cc sql_yacc.hh sql_yacc_ora.cc sql_yacc_ora.hh) FOREACH(file yy_mariadb.cc yy_mariadb.hh yy_oracle.cc yy_oracle.hh)
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file} AND (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${file})) IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file} AND (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${file}))
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file} CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}
${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY) ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY)
@ -336,7 +337,7 @@ IF (NOT BISON_FOUND)
ENDFOREACH() ENDFOREACH()
ENDIF() ENDIF()
IF(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.cc) IF(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/yy_mariadb.cc)
# Output files are missing, bail out. # Output files are missing, bail out.
SET(ERRMSG SET(ERRMSG
"Bison (GNU parser generator) is required to build MySQL." "Bison (GNU parser generator) is required to build MySQL."
@ -351,18 +352,17 @@ IF (NOT BISON_FOUND)
MESSAGE(FATAL_ERROR ${ERRMSG}) MESSAGE(FATAL_ERROR ${ERRMSG})
ENDIF() ENDIF()
ELSE() ELSE()
BISON_TARGET(gen_mariadb_cc_hh ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc_mariadb.yy BISON_TARGET(gen_mariadb_cc_hh ${CMAKE_CURRENT_BINARY_DIR}/yy_mariadb.yy
${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.cc ${CMAKE_CURRENT_BINARY_DIR}/yy_mariadb.cc
DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh
COMPILE_FLAGS "-p MYSQL -S ${CMAKE_CURRENT_SOURCE_DIR}/myskel.m4") COMPILE_FLAGS "-p MYSQL -S ${CMAKE_CURRENT_SOURCE_DIR}/myskel.m4")
BISON_TARGET(gen_oracle_cc_hh ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc_ora.yy BISON_TARGET(gen_oracle_cc_hh ${CMAKE_CURRENT_BINARY_DIR}/yy_oracle.yy
${CMAKE_CURRENT_BINARY_DIR}/sql_yacc_ora.cc ${CMAKE_CURRENT_BINARY_DIR}/yy_oracle.cc
COMPILE_FLAGS "-p ORA -S ${CMAKE_CURRENT_SOURCE_DIR}/myskel.m4") COMPILE_FLAGS "-p ORA -S ${CMAKE_CURRENT_SOURCE_DIR}/myskel.m4")
ENDIF() ENDIF()
IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR) IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc ADD_EXECUTABLE(gen_lex_token gen_lex_token.cc
${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.hh) ${CMAKE_CURRENT_BINARY_DIR}/yy_mariadb.hh)
ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc) ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
ENDIF() ENDIF()
@ -381,8 +381,8 @@ ADD_CUSTOM_TARGET(
DEPENDS DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h
${CMAKE_CURRENT_BINARY_DIR}/lex_token.h ${CMAKE_CURRENT_BINARY_DIR}/lex_token.h
${CMAKE_CURRENT_BINARY_DIR}/sql_yacc.cc ${CMAKE_CURRENT_BINARY_DIR}/yy_mariadb.cc
${CMAKE_CURRENT_BINARY_DIR}/sql_yacc_ora.cc ${CMAKE_CURRENT_BINARY_DIR}/yy_oracle.cc
) )
IF(WIN32 OR HAVE_DLOPEN AND NOT DISABLE_SHARED) IF(WIN32 OR HAVE_DLOPEN AND NOT DISABLE_SHARED)
@ -397,8 +397,8 @@ CONFIGURE_FILE(
ADD_CUSTOM_TARGET(dist ADD_CUSTOM_TARGET(dist
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/make_dist.cmake COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/make_dist.cmake
DEPENDS ${CMAKE_BINARY_DIR}/sql/sql_yacc.cc ${CMAKE_BINARY_DIR}/sql/sql_yacc.hh DEPENDS ${CMAKE_BINARY_DIR}/sql/yy_mariadb.cc ${CMAKE_BINARY_DIR}/sql/yy_mariadb.hh
DEPENDS ${CMAKE_BINARY_DIR}/sql/sql_yacc_ora.cc ${CMAKE_BINARY_DIR}/sql/sql_yacc_ora.hh DEPENDS ${CMAKE_BINARY_DIR}/sql/yy_oracle.cc ${CMAKE_BINARY_DIR}/sql/yy_oracle.hh
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
) )

2
sql/gen_lex_token.cc
View file

@ -19,7 +19,7 @@
/* We only need the tokens here */ /* We only need the tokens here */
#define YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED
#include <sql_yacc.hh> #include <yy_mariadb.hh>
#include <lex.h> #include <lex.h>
#include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */ #include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */

2
sql/item_func.h
View file

@ -2761,7 +2761,7 @@ public:
{ return get_item_copy<Item_func_udf_str>(thd, this); } { return get_item_copy<Item_func_udf_str>(thd, this); }
}; };
#else /* Dummy functions to get sql_yacc.cc compiled */ #else /* Dummy functions to get yy_*.cc files compiled */
class Item_func_udf_float :public Item_real_func class Item_func_udf_float :public Item_real_func
{ {

2
sql/item_sum.h
View file

@ -1766,7 +1766,7 @@ public:
{ return get_item_copy<Item_sum_udf_decimal>(thd, this); } { return get_item_copy<Item_sum_udf_decimal>(thd, this); }
}; };
#else /* Dummy functions to get sql_yacc.cc compiled */ #else /* Dummy functions to get yy_*.cc files compiled */
class Item_sum_udf_float :public Item_sum_double class Item_sum_udf_float :public Item_sum_double
{ {

2
sql/sql_digest.cc
View file

@ -32,7 +32,7 @@
#include "sql_get_diagnostics.h" #include "sql_get_diagnostics.h"
/* Generated code */ /* Generated code */
#include "sql_yacc.hh" #include "yy_mariadb.hh"
#define LEX_TOKEN_WITH_DEFINITION #define LEX_TOKEN_WITH_DEFINITION
#include "lex_token.h" #include "lex_token.h"

8
sql/sql_lex.h
View file

@ -355,7 +355,7 @@ void binlog_unsafe_map_init();
#ifdef MYSQL_SERVER #ifdef MYSQL_SERVER
/* /*
The following hack is needed because sql_yacc.cc does not define The following hack is needed because yy_*.cc do not define
YYSTYPE before including this file YYSTYPE before including this file
*/ */
#ifdef MYSQL_YACC #ifdef MYSQL_YACC
@ -363,10 +363,10 @@ void binlog_unsafe_map_init();
#else #else
#include "lex_symbol.h" #include "lex_symbol.h"
#ifdef MYSQL_LEX #ifdef MYSQL_LEX
#include "item_func.h" /* Cast_target used in sql_yacc.hh */ #include "item_func.h" /* Cast_target used in yy_mariadb.hh */
#include "sql_get_diagnostics.h" /* Types used in sql_yacc.hh */ #include "sql_get_diagnostics.h" /* Types used in yy_mariadb.hh */
#include "sp_pcontext.h" #include "sp_pcontext.h"
#include "sql_yacc.hh" #include "yy_mariadb.hh"
#define LEX_YYSTYPE YYSTYPE * #define LEX_YYSTYPE YYSTYPE *
#else #else
#define LEX_YYSTYPE void * #define LEX_YYSTYPE void *

4
sql/sql_parse.cc
View file

@ -10374,8 +10374,8 @@ bool check_host_name(LEX_CSTRING *str)
} }
extern int MYSQLparse(THD *thd); // from sql_yacc.cc extern int MYSQLparse(THD *thd); // from yy_mariadb.cc
extern int ORAparse(THD *thd); // from sql_yacc_ora.cc extern int ORAparse(THD *thd); // from yy_oracle.cc
/** /**

2
sql/sql_priv.h
View file

@ -392,7 +392,7 @@ enum enum_yes_no_unknown
*/ */
/* sql_yacc.cc */ /* yy_*.cc */
#ifndef DBUG_OFF #ifndef DBUG_OFF
extern void turn_parser_debug_on_MYSQLparse(); extern void turn_parser_debug_on_MYSQLparse();
extern void turn_parser_debug_on_ORAparse(); extern void turn_parser_debug_on_ORAparse();

4
sql/sql_yacc.yy
View file

@ -165,7 +165,7 @@ static void yyerror(THD *thd, const char *s)
void _CONCAT_UNDERSCORED(turn_parser_debug_on,yyparse)() void _CONCAT_UNDERSCORED(turn_parser_debug_on,yyparse)()
{ {
/* /*
MYSQLdebug is in sql/sql_yacc.cc, in bison generated code. MYSQLdebug is in sql/yy_*.cc, in bison generated code.
Turning this option on is **VERY** verbose, and should be Turning this option on is **VERY** verbose, and should be
used when investigating a syntax error problem only. used when investigating a syntax error problem only.
@ -17791,7 +17791,7 @@ uninstall:
} }
; ;
/* Avoid compiler warning from sql_yacc.cc where yyerrlab1 is not used */ /* Avoid compiler warning from yy_*.cc where yyerrlab1 is not used */
keep_gcc_happy: keep_gcc_happy:
IMPOSSIBLE_ACTION IMPOSSIBLE_ACTION
{ {