Changeset: 6d8d3779113d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6d8d3779113d
Modified Files:
sql/backends/monet5/sql_scenario.c
Branch: default
Log Message:
Partial backout of changeset 1a83ea778949.
Removed some unfinished code that leaks memory to boot.
diffs (37 lines):
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -1180,32 +1180,13 @@ SQLstatementIntern(Client c, str *expr,
#endif
if ( execute) {
- bstream *tmp=NULL;
- buffer *b= (buffer*) GDKmalloc(sizeof(buffer));
MalBlkPtr mb = c->curprg->def;
if (!output)
sql->out = NULL; /* no output */
-
- /* if the MAL program has been turned into a string
returing function
- * then pick the result set from a scratch file (as is)
*/
- if ( mb->var[0]->type == TYPE_str){
- tmp = bstream_create(buffer_rastream(b,
"SQLoutput"), 0);
- if ( tmp == NULL){
- msg =
createException(SQL,"sql.eval","Can not create tmp file");
- GDKfree(b);
- goto noexecution;
- }
- //sql->out = tmp;
- }
- msg = (str) runMAL(c, mb, 0, 0);
-noexecution:
+ msg = runMAL(c, mb, 0, 0);
MSresetInstructions(mb, oldstop);
freeVariables(c, mb, c->glb, oldvtop);
- if (msg == MAL_SUCCEED && tmp){
- msg = GDKstrdup(b->buf);
- (void) bstream_destroy(tmp);
- }
}
sqlcleanup(m, 0);
if (!execute) {
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
