Changeset: ddb0e09e5b26 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ddb0e09e5b26
Modified Files:
common/stream/mapi_stream.c
gdk/gdk_heap.c
Branch: default
Log Message:
Merge with Sep2022 branch.
diffs (truncated from 937 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -784,3 +784,4 @@ 68c0e35095ad6a58766c6c1e77229d73148433e2
47675351fec22d5d5dc81eec03dfa08f505afc99 Sep2022_7
47675351fec22d5d5dc81eec03dfa08f505afc99 Sep2022_release
44e45c9a451f6afd933773094ec25723f713d3be Jan2022_23
+44e45c9a451f6afd933773094ec25723f713d3be Jan2022_SP5_release
diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt
--- a/clients/CMakeLists.txt
+++ b/clients/CMakeLists.txt
@@ -9,7 +9,9 @@
add_subdirectory(mapiclient)
add_subdirectory(mapilib)
add_subdirectory(odbc)
-add_subdirectory(examples)
+if(TESTING)
+ add_subdirectory(examples)
+endif()
if(WIN32)
add_subdirectory(NT)
endif()
diff --git a/clients/examples/C/CMakeLists.txt
b/clients/examples/C/CMakeLists.txt
--- a/clients/examples/C/CMakeLists.txt
+++ b/clients/examples/C/CMakeLists.txt
@@ -6,104 +6,102 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V.
#]]
-if(TESTING)
- add_executable(sample0
- sample0.c)
+add_executable(sample0
+ sample0.c)
- target_link_libraries(sample0
- PRIVATE mapi)
+target_link_libraries(sample0
+ PRIVATE mapi)
- add_executable(sample1
- sample1.c)
+add_executable(sample1
+ sample1.c)
- target_link_libraries(sample1
- PRIVATE mapi)
+target_link_libraries(sample1
+ PRIVATE mapi)
- add_executable(sample4
- sample4.c)
+add_executable(sample4
+ sample4.c)
- target_link_libraries(sample4
- PRIVATE mapi)
+target_link_libraries(sample4
+ PRIVATE mapi)
- add_executable(smack00
- smack00.c)
+add_executable(smack00
+ smack00.c)
- target_link_libraries(smack00
- PRIVATE mapi)
+target_link_libraries(smack00
+ PRIVATE mapi)
- add_executable(smack01
- smack01.c)
+add_executable(smack01
+ smack01.c)
- target_link_libraries(smack01
- PRIVATE mapi)
+target_link_libraries(smack01
+ PRIVATE mapi)
- add_executable(streamcat
- streamcat.c)
+add_executable(streamcat
+ streamcat.c)
- target_link_libraries(streamcat
- PRIVATE
- monetdb_config_header
- stream)
+target_link_libraries(streamcat
+ PRIVATE
+ monetdb_config_header
+ stream)
- add_executable(testcondvar
- testcondvar.c)
+add_executable(testcondvar
+ testcondvar.c)
- target_link_libraries(testcondvar
- PRIVATE
- monetdb_config_header
- bat
- Threads::Threads
+target_link_libraries(testcondvar
+ PRIVATE
+ monetdb_config_header
+ bat
+ Threads::Threads
)
- add_executable(bincopydata
- bincopydata.c
- bincopydata.h
- bincopytemporaldata.c
- bincopyuuid.c
+add_executable(bincopydata
+ bincopydata.c
+ bincopydata.h
+ bincopytemporaldata.c
+ bincopyuuid.c
)
- target_link_libraries(bincopydata
- PRIVATE
- monetdb_config_header
- copybinary
+target_link_libraries(bincopydata
+ PRIVATE
+ monetdb_config_header
+ copybinary
)
- add_executable(bincopyloops
- bincopyloops.c
+add_executable(bincopyloops
+ bincopyloops.c
)
- target_link_libraries(bincopyloops
- PRIVATE
- monetdb_config_header
- copybinary
+target_link_libraries(bincopyloops
+ PRIVATE
+ monetdb_config_header
+ copybinary
)
- install(TARGETS
- sample0
- sample1
- sample4
- smack00
- smack01
- streamcat
- testcondvar
- bincopydata
- RUNTIME
- DESTINATION
- ${CMAKE_INSTALL_BINDIR}
- COMPONENT clienttest)
+install(TARGETS
+ sample0
+ sample1
+ sample4
+ smack00
+ smack01
+ streamcat
+ testcondvar
+ bincopydata
+ RUNTIME
+ DESTINATION
+ ${CMAKE_INSTALL_BINDIR}
+ COMPONENT clienttest)
- if(WIN32)
- install(FILES
- $<TARGET_PDB_FILE:sample0>
- $<TARGET_PDB_FILE:sample1>
- $<TARGET_PDB_FILE:sample4>
- $<TARGET_PDB_FILE:smack00>
- $<TARGET_PDB_FILE:smack01>
- $<TARGET_PDB_FILE:streamcat>
- $<TARGET_PDB_FILE:testcondvar>
- $<TARGET_PDB_FILE:bincopydata>
- $<TARGET_PDB_FILE:bincopyloops>
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- OPTIONAL)
- endif()
+if(WIN32)
+ install(FILES
+ $<TARGET_PDB_FILE:sample0>
+ $<TARGET_PDB_FILE:sample1>
+ $<TARGET_PDB_FILE:sample4>
+ $<TARGET_PDB_FILE:smack00>
+ $<TARGET_PDB_FILE:smack01>
+ $<TARGET_PDB_FILE:streamcat>
+ $<TARGET_PDB_FILE:testcondvar>
+ $<TARGET_PDB_FILE:bincopydata>
+ $<TARGET_PDB_FILE:bincopyloops>
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ OPTIONAL)
endif()
diff --git a/clients/examples/perl/CMakeLists.txt
b/clients/examples/perl/CMakeLists.txt
--- a/clients/examples/perl/CMakeLists.txt
+++ b/clients/examples/perl/CMakeLists.txt
@@ -6,16 +6,14 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V.
#]]
-if(TESTING)
- install(FILES
- sqlsample.pl
- PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT}
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- COMPONENT clienttest)
+install(FILES
+ sqlsample.pl
+ PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT}
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ COMPONENT clienttest)
- install(FILES
- malsample.pl
- PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT}
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- COMPONENT clienttest)
-endif()
+install(FILES
+ malsample.pl
+ PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT}
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ COMPONENT clienttest)
diff --git a/clients/examples/php/CMakeLists.txt
b/clients/examples/php/CMakeLists.txt
--- a/clients/examples/php/CMakeLists.txt
+++ b/clients/examples/php/CMakeLists.txt
@@ -6,10 +6,8 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2022 MonetDB B.V.
#]]
-if(TESTING)
- install(FILES
- sqlsample.php
- PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT}
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- COMPONENT clienttest)
-endif()
+install(FILES
+ sqlsample.php
+ PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT}
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ COMPONENT clienttest)
diff --git a/clients/mapiclient/ReadlineTools.c
b/clients/mapiclient/ReadlineTools.c
--- a/clients/mapiclient/ReadlineTools.c
+++ b/clients/mapiclient/ReadlineTools.c
@@ -406,7 +406,7 @@ invoke_editor(int cnt, int key) {
}
fclose(fp);
- MT_remove(template);
+ (void) MT_remove(template);
return 0;
@@ -414,7 +414,7 @@ bailout:
if (fp)
fclose(fp);
free(read_buff);
- MT_remove(template);
+ (void) MT_remove(template);
return 1;
}
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -3390,7 +3390,7 @@ dump_database(Mapi mid, stream *toConsol
}
if (priv & 64) {
mnstr_printf(toConsole, "%s TRUNCATE", sep);
- sep = ",";
+ // sep = ","; /* sep will be
overwritten after this */
}
}
mnstr_printf(toConsole, " ON TABLE ");
diff --git a/clients/odbc/CMakeLists.txt b/clients/odbc/CMakeLists.txt
--- a/clients/odbc/CMakeLists.txt
+++ b/clients/odbc/CMakeLists.txt
@@ -13,6 +13,8 @@ if(ODBC_FOUND)
add_subdirectory(setup)
endif()
add_subdirectory(driver)
- add_subdirectory(samples)
- add_subdirectory(tests)
+ if(TESTING)
+ add_subdirectory(samples)
+ add_subdirectory(tests)
+ endif()
endif()
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
