MonetDB: default - Merge with Aug2018 branch.

[Sjoerd Mullender]

Changeset: 17e58967c434 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=17e58967c434
Modified Files:
        clients/odbc/driver/ODBCConvert.c
Branch: default
Log Message:

Merge with Aug2018 branch.


diffs (22 lines):

diff --git a/clients/odbc/driver/ODBCConvert.c 
b/clients/odbc/driver/ODBCConvert.c
--- a/clients/odbc/driver/ODBCConvert.c
+++ b/clients/odbc/driver/ODBCConvert.c
@@ -2944,6 +2944,9 @@ ODBCStore(ODBCStmt *stmt,
                break;
        }
 
+       assigns(buf, bufpos, buflen, sep, stmt);
+       *bufp = buf;
+
        if (strlen_or_ind_ptr != NULL && *strlen_or_ind_ptr == SQL_NULL_DATA) {
                assigns(buf, bufpos, buflen, "NULL", stmt);
                *bufp = buf;
@@ -3188,8 +3191,6 @@ ODBCStore(ODBCStmt *stmt,
                break;
        }
 
-       assigns(buf, bufpos, buflen, sep, stmt);
-       *bufp = buf;
        /* just the types supported by the server */
        switch (sqltype) {
        case SQL_CHAR:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list