diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-07-29 13:51:02 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-07-29 13:51:02 +0200 |
| commit | 83d7e4faf6967ddd16b7dde6a89d65729c41b98d (patch) | |
| tree | 3663b62237d9250b83d094166823b20c6c8f92a1 /storage/mroonga | |
| parent | 6152ab7b42c18d62030ef9c23e9abb3817c73f39 (diff) | |
| parent | fb8be6a631e68c57d36c1a0637033f6827105366 (diff) | |
| download | mariadb-git-83d7e4faf6967ddd16b7dde6a89d65729c41b98d.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'storage/mroonga')
| -rw-r--r-- | storage/mroonga/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/version_full (renamed from storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/version) | 0 | ||||
| -rw-r--r-- | storage/mroonga/version_full (renamed from storage/mroonga/version) | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/storage/mroonga/CMakeLists.txt b/storage/mroonga/CMakeLists.txt index c57a524ff1e..4403a041881 100644 --- a/storage/mroonga/CMakeLists.txt +++ b/storage/mroonga/CMakeLists.txt @@ -80,7 +80,7 @@ else() set(MRN_SOURCE_DIR ${CMAKE_SOURCE_DIR}) endif() -file(READ ${MRN_SOURCE_DIR}/version MRN_VERSION) +file(READ ${MRN_SOURCE_DIR}/version_full MRN_VERSION) file(READ ${MRN_SOURCE_DIR}/version_major MRN_VERSION_MAJOR) file(READ ${MRN_SOURCE_DIR}/version_minor MRN_VERSION_MINOR) file(READ ${MRN_SOURCE_DIR}/version_micro MRN_VERSION_MICRO) diff --git a/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt b/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt index d1ca2a8a0d8..ae083028038 100644 --- a/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt +++ b/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt @@ -28,7 +28,7 @@ endif() set(GROONGA_NORMALIZER_MYSQL_EMBED ${GROONGA_NORMALIZER_MYSQL_EMBED_DEFAULT} CACHE BOOL "Build as a static library to embed into an application") -file(READ "${CMAKE_CURRENT_SOURCE_DIR}/version" VERSION) +file(READ "${CMAKE_CURRENT_SOURCE_DIR}/version_full" VERSION) if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") set(GROONGA_NORMALIZER_MYSQL_BUNDLED FALSE) diff --git a/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/version b/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/version_full index 8cfbc905b39..8cfbc905b39 100644 --- a/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/version +++ b/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/version_full diff --git a/storage/mroonga/version b/storage/mroonga/version_full index 5b1f56847ae..5b1f56847ae 100644 --- a/storage/mroonga/version +++ b/storage/mroonga/version_full |