Changeset: 457a4371afca for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/457a4371afca
Modified Files:
clients/odbc/driver/SQLPrepare.c
Branch: nested
Log Message:
merge with default
diffs (166 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -964,6 +964,7 @@ sed -i 's/1\.2/1.1/' misc/selinux/monetd
%endif
%cmake3 \
+ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_RUNSTATEDIR=/run \
-DRELEASE_VERSION=ON \
-DASSERT=OFF \
diff --git a/clients/odbc/driver/ODBCStmt.c b/clients/odbc/driver/ODBCStmt.c
--- a/clients/odbc/driver/ODBCStmt.c
+++ b/clients/odbc/driver/ODBCStmt.c
@@ -130,10 +130,10 @@ int
isValidStmt(ODBCStmt *stmt)
{
#ifdef ODBCDEBUG
- if (!(stmt &&stmt->Type == ODBC_STMT_MAGIC_NR))
+ if (!(stmt && stmt->Type == ODBC_STMT_MAGIC_NR))
ODBCLOG("stmt %p not a valid statement handle\n", stmt);
#endif
- return stmt &&stmt->Type == ODBC_STMT_MAGIC_NR;
+ return stmt && stmt->Type == ODBC_STMT_MAGIC_NR;
}
diff --git a/clients/odbc/driver/SQLExecute.c b/clients/odbc/driver/SQLExecute.c
--- a/clients/odbc/driver/SQLExecute.c
+++ b/clients/odbc/driver/SQLExecute.c
@@ -222,7 +222,11 @@ ODBCInitResult(ODBCStmt *stmt)
goto nomem;
} else {
rec->sql_desc_unnamed = SQL_UNNAMED;
+ if (rec->sql_desc_label)
+ free(rec->sql_desc_label);
rec->sql_desc_label = NULL;
+ if (rec->sql_desc_name)
+ free(rec->sql_desc_name);
rec->sql_desc_name = NULL;
}
if (rec->sql_desc_base_column_name)
diff --git a/clients/odbc/driver/SQLPrepare.c b/clients/odbc/driver/SQLPrepare.c
--- a/clients/odbc/driver/SQLPrepare.c
+++ b/clients/odbc/driver/SQLPrepare.c
@@ -299,7 +299,6 @@ MNDBPrepare(ODBCStmt *stmt,
/* unused fields */
rec->sql_desc_auto_unique_value = SQL_FALSE;
rec->sql_desc_data_ptr = NULL;
- rec->sql_desc_display_size = 0;
rec->sql_desc_indicator_ptr = NULL;
rec->sql_desc_literal_prefix = NULL;
rec->sql_desc_literal_suffix = NULL;
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -147,16 +147,23 @@ macro(monetdb_macro_variables)
set(HAVE_RTREE ${RTREE_FOUND})
set(HAVE_OPENSSL ${OPENSSL_FOUND})
- set(BUILD_TYPE ${CMAKE_BUILD_TYPE})
- if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
- set(EXTRA_C_FLAGS "${CMAKE_C_FLAGS_DEBUG}")
- elseif (${CMAKE_BUILD_TYPE} STREQUAL "Release")
- set(EXTRA_C_FLAGS "${CMAKE_C_FLAGS_RELEASE}")
- elseif (${CMAKE_BUILD_TYPE} STREQUAL "MinSizeRel")
- set(EXTRA_C_FLAGS "${CMAKE_C_FLAGS_MINSIZEREL}")
- else (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
- set(EXTRA_C_FLAGS "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
- endif ()
+ set(BUILD_TYPE "${CMAKE_BUILD_TYPE}")
+ if(CMAKE_BUILD_TYPE)
+ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+ set(EXTRA_C_FLAGS "${CMAKE_C_FLAGS_DEBUG}")
+ elseif (${CMAKE_BUILD_TYPE} STREQUAL "Release")
+ set(EXTRA_C_FLAGS "${CMAKE_C_FLAGS_RELEASE}")
+ elseif (${CMAKE_BUILD_TYPE} STREQUAL "MinSizeRel")
+ set(EXTRA_C_FLAGS "${CMAKE_C_FLAGS_MINSIZEREL}")
+ else (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
+ set(EXTRA_C_FLAGS "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+ endif ()
+ if(NOT "${CMAKE_C_FLAGS}" STREQUAL "")
+ string(APPEND EXTRA_C_FLAGS " " ${CMAKE_C_FLAGS})
+ endif()
+ else()
+ set(EXTRA_C_FLAGS "${CMAKE_C_FLAGS}")
+ endif()
if(MALLOC_FOUND)
if(${WITH_MALLOC} STREQUAL "jemalloc")
diff --git a/cmake/monetdb-functions.cmake b/cmake/monetdb-functions.cmake
--- a/cmake/monetdb-functions.cmake
+++ b/cmake/monetdb-functions.cmake
@@ -111,16 +111,18 @@ function(monetdb_cmake_summary)
message(STATUS "Sphinx: ${SPHINX_FOUND}")
message(STATUS "Semodule: ${SEMODULE_FOUND}")
message(STATUS "Awk: ${AWK_FOUND}")
- message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
- if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
- message(STATUS "Extra C flags: ${CMAKE_C_FLAGS_DEBUG}")
- elseif (${CMAKE_BUILD_TYPE} STREQUAL "Release")
- message(STATUS "Extra C flags: ${CMAKE_C_FLAGS_RELEASE}")
- elseif (${CMAKE_BUILD_TYPE} STREQUAL "MinSizeRel")
- message(STATUS "Extra C flags: ${CMAKE_C_FLAGS_MINSIZEREL}")
- else (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
- message(STATUS "Extra C flags: ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
- endif ()
+ if(CMAKE_BUILD_TYPE)
+ message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
+ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+ message(STATUS "Extra C flags: ${CMAKE_C_FLAGS_DEBUG}")
+ elseif (${CMAKE_BUILD_TYPE} STREQUAL "Release")
+ message(STATUS "Extra C flags: ${CMAKE_C_FLAGS_RELEASE}")
+ elseif (${CMAKE_BUILD_TYPE} STREQUAL "MinSizeRel")
+ message(STATUS "Extra C flags: ${CMAKE_C_FLAGS_MINSIZEREL}")
+ else (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
+ message(STATUS "Extra C flags: ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+ endif ()
+ endif()
message(STATUS "-----------------------------------------")
message(STATUS "")
endfunction()
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ DH_VERBOSE=1
override_dh_auto_configure:
dh_auto_configure -- \
-DPYTHON3_LIBDIR=lib/python3/dist-packages \
+ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_RUNSTATEDIR=/run \
-DRELEASE_VERSION=ON \
-DASSERT=OFF \
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -194,8 +194,8 @@
#cmakedefine HAVE_LIBPY3 1
#cmakedefine HAVE_OPENSSL 1
-#cmakedefine BUILD_TYPE "@BUILD_TYPE@"
-#cmakedefine EXTRA_C_FLAGS "@EXTRA_C_FLAGS@"
+#define BUILD_TYPE "@BUILD_TYPE@"
+#define EXTRA_C_FLAGS "@EXTRA_C_FLAGS@"
#cmakedefine WITH_JEMALLOC 1
#cmakedefine WITH_MIMALLOC 1
diff --git a/tools/mserver/CMakeLists.txt b/tools/mserver/CMakeLists.txt
--- a/tools/mserver/CMakeLists.txt
+++ b/tools/mserver/CMakeLists.txt
@@ -25,12 +25,11 @@ string(APPEND builtby "@" ${host})
set(compilercall ${CMAKE_C_COMPILER})
set(linkercall ${CMAKE_LINKER})
-if(${CMAKE_BUILD_TYPE})
+if(CMAKE_BUILD_TYPE)
string(TOUPPER ${CMAKE_BUILD_TYPE} build_type)
- string(APPEND compilercall " " ${CMAKE_C_FLAGS_${build_type}}
${CMAKE_C_FLAGS})
-else()
- string(APPEND compilercall " " ${CMAKE_C_FLAGS})
+ string(APPEND compilercall " " ${CMAKE_C_FLAGS_${build_type}})
endif()
+string(APPEND compilercall " " ${CMAKE_C_FLAGS})
configure_file(monet_version.c.in
${CMAKE_CURRENT_BINARY_DIR}/monet_version.c
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
