summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2021-07-27 19:21:39 +0200
committerSergei Golubchik <serg@mariadb.org>2021-07-27 20:44:46 +0200
commit65e3d0853860d4991430b49949d01d60b8dc97f1 (patch)
tree3b08e8177490eff3b475bdada56dcec480c07240
parentaaac2477ca4967a4a7db02fdfcf9c4aa946d491d (diff)
downloadmariadb-git-65e3d0853860d4991430b49949d01d60b8dc97f1.tar.gz
MDEV-7209 mroonga storage engine fails to build on OpenBSD
rename files `version` -> `version_full`
-rw-r--r--storage/mroonga/CMakeLists.txt2
-rw-r--r--storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt2
-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 317c337e247..6671b3a8d56 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 80e531e5319..96e3f1a570d 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
@@ -29,7 +29,7 @@ option(GROONGA_NORMALIZER_MYSQL_EMBED
"Build as a static library to embed into an application"
${GROONGA_NORMALIZER_MYSQL_EMBED_DEFAULT})
-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