Changeset: a3e55ee55c4c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a3e55ee55c4c Modified Files: sql/src/test/leaks/Tests/bbp.sql sql/src/test/leaks/Tests/bbp.sql.src Branch: Jun2010 Log Message:
made "leaks" tests work, again in the Jun2010 branch Prior to recent "autoload" and sql initialization changes, the used to be a sql/src/sql/admin.sql script that provided some function (mainly/only?) for the "leaks" tests. The first "leaks" test, "bbb.sql" use to source this script. With the recent changes, the admin.sql script was removed from both the Jun2010 branch and the default. While some more changes in the default seems to make the leaks tests work, again, they fail in the Jun2010 branch as the bbp() (formerly defined in admin.sql) is not available. This checkin makes the leaks tests work, again, by restoring the former "admin.sql" script only locally as "bbp.sql" for the leaks tests. This checkin will not be propagated to the default. diffs (42 lines): diff -r 776189c3f868 -r a3e55ee55c4c sql/src/test/leaks/Tests/bbp.sql --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sql/src/test/leaks/Tests/bbp.sql Tue Jun 22 17:24:55 2010 +0200 @@ -0,0 +1,33 @@ +-- The contents of this file are subject to the MonetDB Public License +-- Version 1.1 (the "License"); you may not use this file except in +-- compliance with the License. You may obtain a copy of the License at +-- http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html +-- +-- Software distributed under the License is distributed on an "AS IS" +-- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +-- License for the specific language governing rights and limitations +-- under the License. +-- +-- The Original Code is the MonetDB Database System. +-- +-- The Initial Developer of the Original Code is CWI. +-- Copyright August 2008-2010 MonetDB B.V. +-- All Rights Reserved. + +-- The MonetDB kernel environment table +create function environment() + returns table (nme string, val string) + external name sql.environment; + +-- The BAT buffer pool overview +create function bbp () + returns table (id int, name string, htype string, + ttype string, count BIGINT, refcnt int, lrefcnt int, + location string, heat int, dirty string, + status string, kind string) + external name sql.bbp; + +-- Change the whereabouts of the log file +create procedure logfile(filename string) + external name sql.logfile; + diff -r 776189c3f868 -r a3e55ee55c4c sql/src/test/leaks/Tests/bbp.sql.src --- a/sql/src/test/leaks/Tests/bbp.sql.src Tue Jun 22 16:30:14 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -$RELSRCDIR/../../../sql/admin.sql _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
