Changeset: 10db29917017 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=10db29917017
Modified Files:
sql/backends/monet5/rest/rest_jsonstore_handle_get.c
sql/backends/monet5/vaults/mseed.c
Branch: Oct2014
Log Message:
SQLstatementIntern grew an extra parameter at some point.
This fixes bug 3664.
I don't have the necessary files to test the mseed change.
diffs (33 lines):
diff --git a/sql/backends/monet5/rest/rest_jsonstore_handle_get.c
b/sql/backends/monet5/rest/rest_jsonstore_handle_get.c
--- a/sql/backends/monet5/rest/rest_jsonstore_handle_get.c
+++ b/sql/backends/monet5/rest/rest_jsonstore_handle_get.c
@@ -69,7 +69,7 @@ RESTsqlQuery(char **result, char * query
be = (backend*)c->sqlcontext;
be->output_format = OFMT_JSON;
- qmsg = SQLstatementIntern(c, &query, "rest", TRUE, TRUE);
+ qmsg = SQLstatementIntern(c, &query, "rest", TRUE, TRUE, NULL);
if (qmsg == MAL_SUCCEED) {
resultstring = buffer_get_buf(resultbuffer);
*result = GDKstrdup(resultstring);
diff --git a/sql/backends/monet5/vaults/mseed.c
b/sql/backends/monet5/vaults/mseed.c
--- a/sql/backends/monet5/vaults/mseed.c
+++ b/sql/backends/monet5/vaults/mseed.c
@@ -112,7 +112,7 @@
#include "vault.h"
#include "mtime.h"
-str SQLstatementIntern(Client c, str *expr, str nme, int execute, bit output);
+#include "sql_scenario.h"
#define QRYinsertI "INSERT INTO mseedCatalog(mseed, seqno, dataquality,
network, \
station, location, channel, starttime , samplerate, sampleindex,
samplecnt, sampletype, minval,maxval) \
@@ -192,7 +192,7 @@ MseedImport(Client cntxt, MalBlkPtr mb,
msg = createException(MAL,"mseed.import","data type not
yet implemented");
goto wrapup;
}
- if ( ( msg
=SQLstatementIntern(cntxt,&s,"mseed.import",TRUE,FALSE)) != MAL_SUCCEED)
+ if ( ( msg
=SQLstatementIntern(cntxt,&s,"mseed.import",TRUE,FALSE,NULL)) != MAL_SUCCEED)
break;
sampleindex += msr->samplecnt;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
