From 0cc189cce43ab47fb2254ffbcbe2911f373e9955 Mon Sep 17 00:00:00 2001 From: Thomas Klausner Date: Wed, 24 Jul 2019 15:26:13 +0200 Subject: [PATCH 1/2] Fix typo in cmake type that breaks build. --- cdk/cmake/config_header.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cdk/cmake/config_header.cmake b/cdk/cmake/config_header.cmake index 4abe7c944..5b855022e 100644 --- a/cdk/cmake/config_header.cmake +++ b/cdk/cmake/config_header.cmake @@ -52,13 +52,13 @@ function(ADD_CONFIG var) set(${var} ${ARGV1} CACHE INTERNAL "config setting" FORCE) list(APPEND CONFIG_VARS_VAL ${var}) list(REMOVE_DUPLICATES CONFIG_VARS_VAL) - set(CONFIG_VARS_VAL ${CONFIG_VARS_VAL} CACHE INERNAL "configuration settings" FORCE) + set(CONFIG_VARS_VAL ${CONFIG_VARS_VAL} CACHE INTERNAL "configuration settings" FORCE) else() list(APPEND CONFIG_VARS ${var}) list(REMOVE_DUPLICATES CONFIG_VARS) - set(CONFIG_VARS ${CONFIG_VARS} CACHE INERNAL "configuration settings" FORCE) + set(CONFIG_VARS ${CONFIG_VARS} CACHE INTERNAL "configuration settings" FORCE) endif() From 3a1f1dc87a25f3707fc94acaa96e8605f51c3ea7 Mon Sep 17 00:00:00 2001 From: Thomas Klausner Date: Wed, 24 Jul 2019 15:36:48 +0200 Subject: [PATCH 2/2] Comment out two errno codes that do not exist on NetBSD. --- cdk/include/mysql/cdk/foundation/std_error_conditions.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cdk/include/mysql/cdk/foundation/std_error_conditions.h b/cdk/include/mysql/cdk/foundation/std_error_conditions.h index e5e44c237..278f96a13 100644 --- a/cdk/include/mysql/cdk/foundation/std_error_conditions.h +++ b/cdk/include/mysql/cdk/foundation/std_error_conditions.h @@ -98,7 +98,7 @@ X (operation_not_permitted, EPERM) \ X (operation_not_supported, EOPNOTSUPP) \ X (operation_would_block, EWOULDBLOCK) \ - X (owner_dead, EOWNERDEAD) \ +/* X (owner_dead, EOWNERDEAD) */\ X (permission_denied, EACCES) \ X (protocol_error, EPROTO) \ X (protocol_not_supported, EPROTONOSUPPORT) \ @@ -106,7 +106,7 @@ X (resource_deadlock_would_occur, EDEADLK) \ X (resource_unavailable_try_again, EAGAIN) \ X (result_out_of_range, ERANGE) \ - X (state_not_recoverable, ENOTRECOVERABLE) \ +/* X (state_not_recoverable, ENOTRECOVERABLE)*/\ /* X (stream_timeout, ETIME) */\ X (text_file_busy, ETXTBSY) \ X (timed_out, ETIMEDOUT) \