Changeset: caa36041bc3c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/caa36041bc3c
Modified Files:
clients/mapiclient/mclient.c
sql/backends/monet5/sql_bincopyconvert.c
Branch: copyfaster
Log Message:
make it compile (some ugly hack with the value array)
diffs (30 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -3191,9 +3191,9 @@ open_urlstream(const char *url, char *er
if ((ret = curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, errbuf)) !=
CURLE_OK ||
(ret = curl_easy_setopt(handle, CURLOPT_URL, url)) != CURLE_OK ||
(ret = curl_easy_setopt(handle, CURLOPT_WRITEDATA, s)) != CURLE_OK
||
- (ret = curl_easy_setopt(handle, CURLOPT_VERBOSE, 0)) != CURLE_OK ||
- (ret = curl_easy_setopt(handle, CURLOPT_NOSIGNAL, 1)) != CURLE_OK ||
- (ret = curl_easy_setopt(handle, CURLOPT_FAILONERROR, 1)) !=
CURLE_OK ||
+ (ret = curl_easy_setopt(handle, CURLOPT_VERBOSE, 0L)) != CURLE_OK ||
+ (ret = curl_easy_setopt(handle, CURLOPT_NOSIGNAL, 1L)) != CURLE_OK
||
+ (ret = curl_easy_setopt(handle, CURLOPT_FAILONERROR, 1L)) !=
CURLE_OK ||
(ret = curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION,
write_callback)) != CURLE_OK ||
(ret = curl_easy_perform(handle)) != CURLE_OK) {
curl_easy_cleanup(handle);
diff --git a/sql/backends/monet5/sql_bincopyconvert.c
b/sql/backends/monet5/sql_bincopyconvert.c
--- a/sql/backends/monet5/sql_bincopyconvert.c
+++ b/sql/backends/monet5/sql_bincopyconvert.c
@@ -418,8 +418,8 @@ insert_single_char(struct insert_state *
if (msg != MAL_SUCCEED)
return msg;
} else {
- char value[2] = {ch, 0};
- if (bunfastapp(st->bat, value) != GDK_SUCCEED)
+ char value[] = {ch, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0};
+ if (bunfastapp(st->bat, (char*)value) != GDK_SUCCEED)
throw(SQL, "insert_nul_terminated_values",
GDK_EXCEPTION);
}
// Prefer to remember the latest occurrence so we can use short backrefs
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
