Changeset: 9216cc8c26cb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9216cc8c26cb
Modified Files:
tools/mserver/mserver5.c
Branch: default
Log Message:
Merge with octbugs branch.
diffs (77 lines):
diff --git a/ctest/tools/monetdbe/test_helper.c
b/ctest/tools/monetdbe/test_helper.c
--- a/ctest/tools/monetdbe/test_helper.c
+++ b/ctest/tools/monetdbe/test_helper.c
@@ -44,7 +44,7 @@
#define MONETDB_COLUMN_TPE monetdbe_column_int64_t
#include "test_helper_template.h"
-#if HAVE_HGE
+#ifdef HAVE_HGE
#define TPE TEST_TPE_ID(int128_t)
#define CHECK_COLUMN_FUNC check_column_int128_t
#define TPE_ENUM monetdbe_int128_t
diff --git a/ctest/tools/monetdbe/test_helper.h
b/ctest/tools/monetdbe/test_helper.h
--- a/ctest/tools/monetdbe/test_helper.h
+++ b/ctest/tools/monetdbe/test_helper.h
@@ -20,7 +20,7 @@ TYPE_DEFTEST_TPE(int8_t, int8_t);
TYPE_DEFTEST_TPE(int16_t, int16_t);
TYPE_DEFTEST_TPE(int32_t, int32_t);
TYPE_DEFTEST_TPE(int64_t, int64_t);
-#if HAVE_HGE
+#ifdef HAVE_HGE
TYPE_DEFTEST_TPE(int128_t, __int128);
#endif
TYPE_DEFTEST_TPE(size_t, size_t);
@@ -41,7 +41,7 @@ extern bool check_column_int8_t (mone
extern bool check_column_int16_t (monetdbe_result* result, size_t
column_index, size_t expected_nr_column_entries, TEST_TPE_ID(int16_t)*
expected_column);
extern bool check_column_int32_t (monetdbe_result* result, size_t
column_index, size_t expected_nr_column_entries, TEST_TPE_ID(int32_t)*
expected_column);
extern bool check_column_int64_t (monetdbe_result* result, size_t
column_index, size_t expected_nr_column_entries, TEST_TPE_ID(int64_t)*
expected_column);
-#if HAVE_HGE
+#ifdef HAVE_HGE
extern bool check_column_int128_t (monetdbe_result* result, size_t
column_index, size_t expected_nr_column_entries, TEST_TPE_ID(int128_t)*
expected_column);
#endif
extern bool check_column_size_t (monetdbe_result* result, size_t
column_index, size_t expected_nr_column_entries, TEST_TPE_ID(size_t)*
expected_column);
@@ -53,7 +53,7 @@ extern bool check_column_date (mone
extern bool check_column_time (monetdbe_result* result, size_t
column_index, size_t expected_nr_column_entries, TEST_TPE_ID(time)*
expected_column);
extern bool check_column_timestamp (monetdbe_result* result, size_t
column_index, size_t expected_nr_column_entries, TEST_TPE_ID(timestamp)*
expected_column);
-#if HAVE_HGE
+#ifdef HAVE_HGE
#define BIGGEST_INTEGER_TPE int128_t
#define check_column_BIGGEST_INTEGER_TPE check_column_int128_t
#else
diff --git a/sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
b/sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
--- a/sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
@@ -31,7 +31,7 @@ Colnr 1.
name myint
type 4
typename int
- precision 32
+ precision 10
scale 0
catalogname null
schemaname sys
@@ -52,7 +52,7 @@ Colnr 2.
name mydouble
type 8
typename double
- precision 53
+ precision 15
scale 0
catalogname null
schemaname sys
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -719,7 +719,9 @@ main(int argc, char **av)
exit(1);
}
*secretp = '\0';
- if ((err = AUTHinitTables(secret)) != MAL_SUCCEED) {
+ err = AUTHinitTables(secret);
+ msab_registerStop();
+ if (err != MAL_SUCCEED) {
fprintf(stderr, "%s\n", err);
freeException(err);
exit(1);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
