diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-01 11:39:38 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-01 11:39:38 +0300 |
| commit | a722ee88f33296eee6a72855570677c48dce7ebf (patch) | |
| tree | 128ce4696a80fd953836b4a9eed20ab8afc4e61c /libmysqld | |
| parent | 5727d56260e66d9b9f2dee6783385c5928d4f3a3 (diff) | |
| parent | 9c7a456a92262bdb44b85a05aa9f87369c5b063c (diff) | |
| download | mariadb-git-a722ee88f33296eee6a72855570677c48dce7ebf.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index e74a6fbc6c2..efdf7277e5b 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -31,9 +31,9 @@ ${SSL_INTERNAL_INCLUDE_DIRS} SET(GEN_SOURCES ${CMAKE_BINARY_DIR}/sql/sql_yacc.hh -${CMAKE_BINARY_DIR}/sql/sql_yacc.cc -${CMAKE_BINARY_DIR}/sql/sql_yacc_ora.hh -${CMAKE_BINARY_DIR}/sql/sql_yacc_ora.cc +${CMAKE_BINARY_DIR}/sql/yy_mariadb.cc +${CMAKE_BINARY_DIR}/sql/yy_oracle.hh +${CMAKE_BINARY_DIR}/sql/yy_oracle.cc ${CMAKE_BINARY_DIR}/sql/lex_hash.h ) |