diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-03-23 12:40:43 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-03-23 17:42:15 +0100 |
| commit | 2ca3861b552d83908327826c1d30f10cf0efd4b3 (patch) | |
| tree | 2885409a244808d0bbeb86273047db21ea059bb3 /storage/maria | |
| parent | 75b7cd680b8272ac5a0848791757c1d310501574 (diff) | |
| download | mariadb-git-2ca3861b552d83908327826c1d30f10cf0efd4b3.tar.gz | |
MDEV-28106 S3 tries to include thread.h while compiling on Windows
S3 engine and libmarias3 don't compile on Windows
also fixes:
MDEV-28104 Typo in storage/maria/s3_func.c: 'FN_DECVHAR
Diffstat (limited to 'storage/maria')
| -rw-r--r-- | storage/maria/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | storage/maria/s3_func.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/maria/CMakeLists.txt b/storage/maria/CMakeLists.txt index 1091b6d9a2c..9e9b8ed4ac0 100644 --- a/storage/maria/CMakeLists.txt +++ b/storage/maria/CMakeLists.txt @@ -117,7 +117,7 @@ SET(S3_SOURCES s3_func.c libmarias3/src/sha256-internal.c libmarias3/src/xml.c libmarias3/src/assume_role.c) -IF(NOT PLUGIN_S3 STREQUAL NO) +IF(NOT PLUGIN_S3 STREQUAL NO AND NOT WIN32) FIND_PACKAGE(CURL) ENDIF() diff --git a/storage/maria/s3_func.c b/storage/maria/s3_func.c index 06178c1c0c2..491a8e0a323 100644 --- a/storage/maria/s3_func.c +++ b/storage/maria/s3_func.c @@ -1310,7 +1310,7 @@ my_bool set_database_and_table_from_path(S3_INFO *s3, const char *path) if (path[length-1] == FN_LIBCHAR || path[length-1] == '/') break; #ifdef FN_DEVCHAR - if (path[length-1] == FN_DECVHAR) + if (path[length-1] == FN_DEVCHAR) break; #endif } |