Changeset: 888b65302cea for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/888b65302cea Modified Files: tools/mserver/monet_version.c.in Branch: default Log Message:
Merge with Oct2020 branch. diffs (79 lines): diff --git a/NT/ChangeLog.Oct2020 b/NT/ChangeLog.Oct2020 new file mode 100644 --- /dev/null +++ b/NT/ChangeLog.Oct2020 @@ -0,0 +1,6 @@ +# ChangeLog file for NT +# This file is updated with Maddlog + +* Fri Apr 23 2021 Sjoerd Mullender <[email protected]> +- Added the monetdbe library to the Windows installer. + diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py --- a/NT/mksqlwxs.py +++ b/NT/mksqlwxs.py @@ -143,6 +143,7 @@ def main(): r'bin\bat.dll', r'bin\mapi.dll', r'bin\monetdb5.dll', + r'bin\monetdbe.dll', r'bin\monetdbsql.dll', r'bin\stream.dll', vcpkg.format(r'bin\iconv-2.dll'), @@ -198,6 +199,7 @@ def main(): [r'lib\bat.lib', r'lib\mapi.lib', r'lib\monetdb5.lib', + r'lib\monetdbe.lib', r'lib\monetdbsql.lib', r'lib\stream.lib', vcpkg.format(r'lib\iconv.lib'), diff --git a/ctest/tools/monetdbe/example2.c b/ctest/tools/monetdbe/example2.c --- a/ctest/tools/monetdbe/example2.c +++ b/ctest/tools/monetdbe/example2.c @@ -170,6 +170,19 @@ main(void) if ((err = monetdbe_cleanup_statement(mdbe, stmt)) != NULL) error(err) + if ((err = monetdbe_prepare(mdbe, "SELECT b, y FROM test where y = ?; ", &stmt)) != NULL) + error(err) + char *y = "Hello"; + if ((err = monetdbe_bind(stmt, y, 0)) != NULL) + error(err) + if ((err = monetdbe_execute(stmt, &result, NULL)) != NULL) + error(err) + fprintf(stdout, "Query result with %zu cols and %"PRId64" rows\n", result->ncols, result->nrows); + if ((err = monetdbe_cleanup_result(mdbe, result)) != NULL) + error(err) + if ((err = monetdbe_cleanup_statement(mdbe, stmt)) != NULL) + error(err) + if (monetdbe_close(mdbe)) error("Failed to close database") return 0; diff --git a/tools/mserver/monet_version.c.in b/tools/mserver/monet_version.c.in --- a/tools/mserver/monet_version.c.in +++ b/tools/mserver/monet_version.c.in @@ -77,10 +77,19 @@ monet_version(void) GDKnr_threads, GDKnr_threads != 1 ? "s" : ""); */ printf("Libraries:\n"); #ifdef HAVE_LIBPCRE + /* PCRE_PRERELEASE may be defined as an empty value. In order + * to get the proper amount of white space between various + * parts of the version string on different compilers (none + * between minor and prerelease, a single one between that + * combination and the date), we need to resort to some + * run-time trickery since we can't do it with the + * preprocessor */ print_libversion("libpcre", - pcre_version(), - XSTRING(PCRE_MAJOR.PCRE_MINOR) XSTRING("" PCRE_PRERELEASE) - " " XSTRING(PCRE_DATE)); + pcre_version(), + XSTRING(Z PCRE_PRERELEASE)[1] == 0 + ? XSTRING(PCRE_MAJOR.PCRE_MINOR PCRE_DATE) + : XSTRING(PCRE_MAJOR.PCRE_MINOR) + XSTRING(PCRE_PRERELEASE PCRE_DATE)); #endif #ifdef HAVE_OPENSSL print_libversion("openssl", _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
