Changeset: d94deaa2f9bf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d94deaa2f9bf
Modified Files:
monetdb5/mal/mal_instruction.mx
sql/scripts/15_history.sql
Branch: default
Log Message:
Merge with Aug2011 branch.
diffs (36 lines):
diff --git a/monetdb5/mal/mal_instruction.mx b/monetdb5/mal/mal_instruction.mx
--- a/monetdb5/mal/mal_instruction.mx
+++ b/monetdb5/mal/mal_instruction.mx
@@ -1358,6 +1358,7 @@ clearVariable(MalBlkPtr mb, int varid)
v->flags = 0;
v->tmpindex = 0;
v->propc = 0;
+ v->eolife = 0;
}
void
diff --git a/sql/scripts/15_history.sql b/sql/scripts/15_history.sql
--- a/sql/scripts/15_history.sql
+++ b/sql/scripts/15_history.sql
@@ -23,13 +23,6 @@
-- Whenever a query is compiled and added to the cache, it is also entered
-- into the 'queryHistory' table using a hardwired call to 'keepQuery'.
--- Temporary and locally disable mitosis to prevent yet undiscoved deadlock;
--- cf., bug 2865 (http://bugs.monetdb.org/show_bug.cgi?id=2865)
-declare dft_opt string;
-set dft_opt = ( select optimizer );
-set optimizer = 'no_mitosis_pipe';
--- cf., `set optimizer = dft_opt` at the end of this script
-
create table queryHistory(
id wrd primary key,
defined timestamp, -- when entered into the cache
@@ -117,7 +110,4 @@ begin
delete from queryHistory;
end;
--- cf., top of this script
-set optimizer = dft_opt;
-
-- set history=true;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
