Changeset: 53872951dc1c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=53872951dc1c
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/mal/Tests/array00.stable.err
monetdb5/modules/mal/Tests/array00.stable.out
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
sql/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out
sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
sql/test/BugTracker-2009/Tests/join_topn.SF-2654133.stable.out
sql/test/BugTracker-2009/Tests/mclient-lsql-D.stable.out
sql/test/BugTracker-2009/Tests/name_clash_with_dump.SF-2780395.stable.out
sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out
sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.stable.out
sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
sql/test/BugTracker/Tests/like_exp.SF-1613949.stable.out
sql/test/BugTracker/Tests/multi-column-constraint.SF-1964587.stable.out
sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
sql/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.err
sql/test/Dump/Tests/dump.stable.out.Windows
sql/test/Tests/systemfunctions.stable.out
sql/test/UserDump/Tests/create.stable.out
sql/test/bugs/Tests/crash_order_by.stable.out
sql/test/bugs/Tests/insert_delete-bug-sf-904025.stable.out
sql/test/bugs/Tests/simple_view.stable.out
sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.stable.out
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp3.stable.out
sql/test/mapi/Tests/php_monetdb.stable.out
sql/test/testdb/Tests/testdb-dump.stable.out
Branch: sciql
Log Message:
updated, fixed, approved stable output of tests
diffs (truncated from 2140 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -879,21 +879,45 @@ str ALGuselect1(int *result, int *bid, p
str ALGuselectInclusive(int *result, int *bid, ptr low, ptr high, bit *lin,
bit *rin);
str ALGvariance(dbl *res, int *bid);
str ALGvariancep(dbl *res, int *bid);
-str ARRAYgridBAT_int(int *ret, int *bid, int *groups, int *groupsize, int
*clustersize, int *offset);
-str ARRAYgridBAT_lng(lng *ret, lng *bid, lng *groups, lng *groupsize, lng
*clustersize, lng *offset);
-str ARRAYgridBATshift_int(int *ret, int *bid, int *groups, int *groupsize, int
*clustersize, int *offset, int *shift);
-str ARRAYgridBATshift_lng(lng *ret, lng *bid, lng *groups, lng *groupsize, lng
*clustersize, lng *offset, lng *shift);
-str ARRAYgridShift_int(int *ret, int *groups, int *groupsize, int
*clustersize, int *offset, int *shift);
-str ARRAYgridShift_lng(lng *ret, lng *groups, lng *groupsize, lng
*clustersize, lng *offset, lng *shift);
-str ARRAYgrid_int(int *ret, int *groups, int *groupsize, int *clustersize, int
*offset);
-str ARRAYgrid_lng(lng *ret, lng *groups, lng *groupsize, lng *clustersize, lng
*offset);
-str ARRAYmultiply_int_int(int *ret, int *bid, int *rid);
-str ARRAYmultiply_int_lng(int *ret, int *bid, int *rid);
-str ARRAYmultiply_lng_lng(int *ret, int *bid, int *rid);
-str ARRAYmultiply_sht_int(int *ret, int *bid, int *rid);
-str ARRAYmultiply_sht_lng(int *ret, int *bid, int *rid);
-str ARRAYproduct(int *ret, int *bid, int *rid);
-str ARRAYproject(int *ret, int *bid, int *cst);
+str ARRAYfiller(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+str ARRAYfiller_bat(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+str ARRAYseries_bte(int *ret, bte *start, bte *step, bte *stop, int *grp, int
*series);
+str ARRAYseries_dbl(int *ret, dbl *start, dbl *step, dbl *stop, int *grp, int
*series);
+str ARRAYseries_flt(int *ret, flt *start, flt *step, flt *stop, int *grp, int
*series);
+str ARRAYseries_int(int *ret, int *start, int *step, int *stop, int *grp, int
*series);
+str ARRAYseries_lng(int *ret, lng *start, lng *step, lng *stop, int *grp, int
*series);
+str ARRAYseries_sht(int *ret, sht *start, sht *step, sht *stop, int *grp, int
*series);
+str ARRAYslice(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+str ARRAYtilesAvg_bte(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesAvg_dbl(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesAvg_flt(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesAvg_int(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesAvg_lng(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesAvg_sht(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesCnt_bte(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesCnt_dbl(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesCnt_flt(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesCnt_int(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesCnt_lng(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesCnt_sht(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesMax_bte(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesMax_dbl(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesMax_flt(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesMax_int(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesMax_lng(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesMax_sht(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesMin_bte(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesMin_dbl(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesMin_flt(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesMin_int(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesMin_lng(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesMin_sht(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesSum_bte(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesSum_dbl(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesSum_flt(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesSum_int(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesSum_lng(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str ARRAYtilesSum_sht(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str AUTHaddUser(oid *ret, Client *c, str *user, str *pass);
str AUTHchangePassword(Client *c, str *oldpass, str *passwd);
str AUTHchangeUsername(Client *c, str *olduser, str *newuser);
@@ -1258,6 +1282,7 @@ str CMDbbptoStr(Client cntxt, MalBlkPtr
str CMDbbptruncate(int *ret, int *bid, str *fnme);
str CMDcalcavg(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDcallBAT(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str CMDcallFunction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDcallString(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDcleanup(int *ret);
str CMDclearEvent(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -1298,7 +1323,6 @@ str CMDgetDiskReads(lng *ret);
str CMDgetDiskWrites(lng *ret);
str CMDgetEvent(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDgetFootprint(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CMDgetMemory(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDgetPageSize(int *ret);
str CMDgetSystemTime(lng *ret);
str CMDgetTrace(int *res, str *ev);
@@ -1320,14 +1344,9 @@ str CMDsetAllProfiler(Client cntxt, MalB
str CMDsetFilterProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str CMDsetFilterVariable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pc);
str CMDsetFootprintFlag(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str CMDsetIOTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CMDsetMemoryFlag(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CMDsetMemoryTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDsetNoneProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str CMDsetProfilerFile(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str CMDsetProfilerStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str CMDsetThreadTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CMDsetTimerTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDsetoid(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDstartPointProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str CMDstartProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -1603,16 +1622,9 @@ str MDBlist3(Client cntxt, MalBlkPtr mb,
str MDBlist3Detail(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MDBlistDetail(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MDBlistMapi(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBsetBigfoot(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MDBsetCatch(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBsetCount(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MDBsetDebug(int *ret, int *flg);
str MDBsetDebugStr(int *ret, str *nme);
-str MDBsetFlow(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str MDBsetIO(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str MDBsetMemory(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str MDBsetThread(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str MDBsetTimer(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MDBsetTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MDBsetVarTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MDBshowFlowGraph(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
@@ -2012,16 +2024,16 @@ sht PropertyIndex(str name);
str PropertyName(sht idx);
prop_op_t PropertyOperator(str s);
str PropertyOperatorString(prop_op_t op);
-str QLOGcall(int *ret, oid *idx, lng *tick1, lng *tick2, str *arg, wrd
*tuples, lng *xtime, lng *rtime, int *cpu, int *iowait, lng *space);
+str QLOGcall(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
void QLOGcalls(BAT **r);
void QLOGcatalog(BAT **r);
-str QLOGdefine(oid *ret, oid *idx, str *q, str *pipe, lng *optimize, str *usr,
lng *tick, int *mal);
-str QLOGdone(int *ret);
-str QLOGinit(int *ret);
-str QLOGinitThreshold(int *ret, int *threshold);
+str QLOGdefine(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str QLOGdisable(int *ret);
+str QLOGempty(int *ret);
+str QLOGenable(int *ret);
+str QLOGenableThreshold(int *ret, int *threshold);
int QLOGisset(void);
str QLOGissetFcn(int *ret);
-str QLOGreset(int *ret);
str QOTclrdebugOptimizers(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str QOTdebugOptimizers(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str QOTgetStatistics(int *ret, str *nme);
@@ -2030,6 +2042,7 @@ str QOTshowFlowGraph(Client cntxt, MalBl
str QOTshowPlan(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
void QOTstatisticsExit(void);
void QOTupdateStatistics(str nme, int prop, lng val);
+QueryQueue QRYqueue;
str RECYCLEdumpQPatWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str RECYCLEdumpWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
int RECYCLEentry(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
@@ -2251,6 +2264,10 @@ str STRsubstring(str *ret, str *s, int *
str STRsubstringTail(str *ret, str *s, int *start);
str STRsuffix(str *ret, str *s, int *l);
str STRtostr(str *res, str *src);
+str SYSMONpause(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str SYSMONqueue(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str SYSMONresume(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str SYSMONstop(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str SYScpuStatistics(int *ret, int *ret2);
str SYSgdkEnv(int *ret, int *ret2);
str SYSgdkThread(int *ret, int *ret2);
@@ -2999,6 +3016,7 @@ str replicatorRef;
void resetMalBlk(MalBlkPtr mb, int stop);
void resetScenario(Client c);
void resetVarName(MalBlkPtr mb, int i);
+void resizeMalBlk(MalBlkPtr mb, int maxstmt, int maxvar);
int resolveType(int dsttype, int srctype);
str resultSetRef;
int reusePolicy;
@@ -3019,11 +3037,13 @@ str runScenario(Client c);
int runonceProp;
void runtimeProfileBegin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, int stkpc,
RuntimeProfile prof, int start);
void runtimeProfileExit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci, RuntimeProfile prof);
-void runtimeProfileInit(MalBlkPtr mb, RuntimeProfile prof, int initmemory);
+void runtimeProfileFinish(Client cntxt, MalBlkPtr mb);
+void runtimeProfileInit(Client cntxt, MalBlkPtr mb, MalStkPtr stk);
str safeguardStack(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
int safetyBarrier(InstrPtr p, InstrPtr q);
int saveBox(Box box, int flag);
str schedulerRef;
+str sciqlRef;
str selectNotNilRef;
str selectRef;
str semaRef;
diff --git a/monetdb5/modules/mal/Tests/array00.stable.err
b/monetdb5/modules/mal/Tests/array00.stable.err
--- a/monetdb5/modules/mal/Tests/array00.stable.err
+++ b/monetdb5/modules/mal/Tests/array00.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'array00` in directory 'modules/mal` itself:
+stderr of test 'array00` in directory 'monetdb5/modules/mal` itself:
# 10:51:36 >
diff --git a/monetdb5/modules/mal/Tests/array00.stable.out
b/monetdb5/modules/mal/Tests/array00.stable.out
--- a/monetdb5/modules/mal/Tests/array00.stable.out
+++ b/monetdb5/modules/mal/Tests/array00.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'array00` in directory 'modules/mal` itself:
+stdout of test 'array00` in directory 'monetdb5/modules/mal` itself:
# 10:51:36 >
diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
--- a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
@@ -93,13 +93,7 @@ mTests_sql_jdbc_tests tmp objects SYSTEM
mTests_sql_jdbc_tests tmp triggers SYSTEM TABLE null null
null null rowid SYSTEM
mTests_sql_jdbc_tests sys arrays SYSTEM VIEW SELECT * FROM (SELECT
pt.*, 0 AS "temporary", pa.valence, pa.fixed, pa.materialised FROM
"sys"."_tables" AS pt, "sys"."_arrays" AS pa WHERE pt.id = pa.table_id UNION
ALL SELECT tt.*, 1 AS "temporary", ta.valence, ta.fixed, ta.materialised FROM
"tmp"."_tables" AS tt, "tmp"."_arrays" AS ta WHERE tt.id = ta.table_id) AS
arrays; null null null rowid SYSTEM
mTests_sql_jdbc_tests sys columns SYSTEM VIEW SELECT * FROM (SELECT
p.* FROM "sys"."_columns" AS p UNION ALL SELECT t.* FROM "tmp"."_columns" AS t)
AS columns; null null null rowid SYSTEM
-<<<<<<< /ufs/zhang/monet/sciql/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
mTests_sql_jdbc_tests sys dimensions SYSTEM VIEW SELECT * FROM
(SELECT pc.*, "pd"."start", pd.step, pd.stop, pd.storage_order FROM
"sys"."_columns" AS pc, "sys"."_dimensions" AS pd WHERE pc.id = pd.column_id
UNION ALL SELECT tc.*, "td"."start", td.step, td.stop, td.storage_order FROM
"tmp"."_columns" AS tc, "tmp"."_dimensions" AS td WHERE tc.id = td.column_id)
AS dimensions; null null null rowid SYSTEM
-mTests_sql_jdbc_tests sys querylog SYSTEM VIEW create view
querylog as
-select qd.*, ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory,
ql.tuples, ql.inblock, ql.oublock from queryhistory qd, callhistory ql
-where qd.id = ql.id; null null null rowid SYSTEM
-mTests_sql_jdbc_tests sys tables SYSTEM VIEW SELECT * FROM (SELECT
p.*, 0 AS "temporary" FROM "sys"."_tables" AS p UNION ALL SELECT t.*, 1 AS
"temporary" FROM "tmp"."_tables" AS t) AS tables where tables.type < 2;
null null null rowid SYSTEM
-=======
mTests_sql_jdbc_tests sys environment SYSTEM VIEW create view
sys.environment as select * from sys.environment(); null null null
rowid SYSTEM
mTests_sql_jdbc_tests sys optimizers SYSTEM VIEW create view
sys.optimizers as select * from sys.optimizers(); null null null
rowid SYSTEM
mTests_sql_jdbc_tests sys querylog_calls SYSTEM VIEW create view
sys.querylog_calls as select * from sys.querylog_calls(); null null
null rowid SYSTEM
@@ -113,7 +107,6 @@ mTests_sql_jdbc_tests sys queue SYSTEM V
mTests_sql_jdbc_tests sys storage SYSTEM VIEW create view sys.storage
as select * from sys.storage(); null null null rowid SYSTEM
mTests_sql_jdbc_tests sys storagemodel SYSTEM VIEW create view
sys.storagemodel as select * from sys.storagemodel(); null null
null rowid SYSTEM
mTests_sql_jdbc_tests sys tables SYSTEM VIEW SELECT * FROM (SELECT
p.*, 0 AS "temporary" FROM "sys"."_tables" AS p UNION ALL SELECT t.*, 1 AS
"temporary" FROM "tmp"."_tables" AS t) AS tables where tables.type <> 2;
null null null rowid SYSTEM
->>>>>>> /tmp/Test_Dobjects.stable.out~other.DAfK6C
mTests_sql_jdbc_tests sys tablestoragemodel SYSTEM VIEW -- A
summary of the table storage requirement is is available as a table view.
-- The auxillary column denotes the maximum space if all non-sorted columns
-- would be augmented with a hash (rare situation)
@@ -126,15 +119,8 @@ as select "schema","table",max(count) as
from sys.storagemodel() group by "schema","table"; null null null
rowid SYSTEM
mTests_sql_jdbc_tests sys tracelog SYSTEM VIEW create view
sys.tracelog as select * from sys.tracelog(); null null null
rowid SYSTEM
mTests_sql_jdbc_tests sys users SYSTEM VIEW SELECT u."name" AS
"name", ui."fullname", ui."default_schema" FROM db_users() AS u LEFT JOIN
"sys"."db_user_info" AS ui ON u."name" = ui."name" ; null null null
rowid SYSTEM
-<<<<<<< /ufs/zhang/monet/sciql/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
mTests_sql_jdbc_tests rs catalog TABLE null null null null
rowid SYSTEM
mTests_sql_jdbc_tests rs files TABLE null null null null
rowid SYSTEM
-mTests_sql_jdbc_tests querylog history VIEW create view
querylog.history as
-select qd.*, ql."start",ql."stop", ql.arguments, ql.tuples, ql.run, ql.ship,
ql.cpu, ql.space, ql.io
-from querylog.catalog() qd, querylog.calls() ql
-where qd.id = ql.id and qd.owner = user; null null null rowid
SYSTEM
-=======
->>>>>>> /tmp/Test_Dobjects.stable.out~other.DAfK6C
# 09:57:01 >
# 09:57:01 > "Done."
diff --git
a/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
b/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
--- a/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
+++ b/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
@@ -113,21 +113,6 @@ Ready.
# 14:58:14 >
START TRANSACTION;
-CREATE SCHEMA "rs" AUTHORIZATION "monetdb";
-SET SCHEMA "rs";
-CREATE TABLE "rs"."files" (
- "fileid" INTEGER,
- "location" CHAR(256),
- "status" TINYINT,
- "lastmodified" TIMESTAMP
-);
-CREATE TABLE "rs"."catalog" (
- "imageid" INTEGER,
- "fileid" INTEGER,
- "width" INTEGER,
- "length" INTEGER,
- "bps" SMALLINT
-);
SET SCHEMA "sys";
CREATE TABLE "sys"."allnewtriples" (
"id" INTEGER NOT NULL,
diff --git
a/sql/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out
b/sql/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out
---
a/sql/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out
+++
b/sql/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out
@@ -48,7 +48,7 @@ Ready.
% int, int, int, varchar, int, int, int, varchar,
int, int, varchar, int, varchar, smallint,
boolean, smallint, boolean, tinyint, int,
varchar, int, int # type
% 1, 1, 1, 0, 1, 1, 1, 0, 1, 1,
0, 1, 0, 1, 5, 1, 5, 1, 1, 0,
1, 1 # length
-# 19:00:10 >
-# 19:00:10 > "Done."
-# 19:00:10 >
+# 14:57:17 >
+# 14:57:17 > Done.
+# 14:57:17 >
diff --git
a/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
b/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
--- a/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
+++ b/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
@@ -84,7 +84,7 @@ stderr of test 'sql_command_kills_db.SF-
MAPI = (monetdb) /var/tmp/mtest-2016/.s.monetdb.32311
QUERY = insert into t1 values ((select id from tables));
-ERROR = !cardinality violation (41>1)
+ERROR = !cardinality violation (47>1)
# 16:15:09 >
# 16:15:09 > Done.
diff --git a/sql/test/BugTracker-2009/Tests/join_topn.SF-2654133.stable.out
b/sql/test/BugTracker-2009/Tests/join_topn.SF-2654133.stable.out
--- a/sql/test/BugTracker-2009/Tests/join_topn.SF-2654133.stable.out
+++ b/sql/test/BugTracker-2009/Tests/join_topn.SF-2654133.stable.out
@@ -44,7 +44,7 @@ Ready.
[ 2024, "args", 2000, NULL, 0, true, 0, false, 0,
1, "one" ]
#drop table x cascade;
-# 18:40:33 >
-# 18:40:33 > "Done."
-# 18:40:33 >
+# 19:39:26 >
+# 19:39:26 > Done.
+# 19:39:26 >
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
