Changeset: 288749b66703 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=288749b66703
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.Windows
clients/Tests/MAL-signatures_nocfitsio.stable.out
clients/Tests/MAL-signatures_nogeom.stable.out
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.32bit
clients/Tests/SQL-dump.stable.out.64bit.oid32
clients/Tests/SQL-dump_nogeom.stable.out
clients/Tests/exports.stable.out
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit
sql/test/BugTracker-2013/Tests/swapped_likejoin.Bug-3375.stable.out
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err.Windows
sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions_nogeom.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1_nogeom.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2_nogeom.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3_nogeom.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4_nogeom.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5_nogeom.stable.out
sql/test/mapi/Tests/php_monetdb.stable.out
sql/test/mapi/Tests/php_monetdb_nogeom.stable.out
Branch: default
Log Message:
approved stable output after changeset f2519f4ecd39
diffs (truncated from 7897 to 300 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -42431,6 +42431,10 @@ pattern sql.settimeout(s:lng):void
address CLTsetTimeout;
comment Abort query after s seconds
+pattern sql.sessions()
(user:bat[:oid,:str],start:bat[:oid,:timestamp],stimeout:bat[:oid,:lng],lastcmd:bat[:oid,:timestamp],qtimeout:bat[:oid,:lng],idle:bat[:oid,:bit])
+address sql_sessions_wrap;
+comment SQL export table of active sessions, their timeouts and idle status
+
pattern sql.sql_variables():bat[:oid,:str]
address sql_variables;
comment return the table with session variables
diff --git a/clients/Tests/MAL-signatures.stable.out.Windows
b/clients/Tests/MAL-signatures.stable.out.Windows
--- a/clients/Tests/MAL-signatures.stable.out.Windows
+++ b/clients/Tests/MAL-signatures.stable.out.Windows
@@ -42405,6 +42405,10 @@ pattern sql.settimeout(s:lng):void
address CLTsetTimeout;
comment Abort query after s seconds
+pattern sql.sessions()
(user:bat[:oid,:str],start:bat[:oid,:timestamp],stimeout:bat[:oid,:lng],lastcmd:bat[:oid,:timestamp],qtimeout:bat[:oid,:lng],idle:bat[:oid,:bit])
+address sql_sessions_wrap;
+comment SQL export table of active sessions, their timeouts and idle status
+
pattern sql.sql_variables():bat[:oid,:str]
address sql_variables;
comment return the table with session variables
diff --git a/clients/Tests/MAL-signatures_nocfitsio.stable.out
b/clients/Tests/MAL-signatures_nocfitsio.stable.out
--- a/clients/Tests/MAL-signatures_nocfitsio.stable.out
+++ b/clients/Tests/MAL-signatures_nocfitsio.stable.out
@@ -42342,6 +42342,10 @@ pattern sql.storage() (schema:bat[:oid,:
address sql_storage;
comment return a table with storage information
+pattern sql.sessions()
(user:bat[:oid,:str],start:bat[:oid,:timestamp],stimeout:bat[:oid,:lng],lastcmd:bat[:oid,:timestamp],qtimeout:bat[:oid,:lng],idle:bat[:oid,:bit])
+address sql_sessions_wrap;
+comment SQL export table of active sessions, their timeouts and idle status
+
pattern sql.sql_variables():bat[:oid,:str]
address sql_variables;
comment return the table with session variables
diff --git a/clients/Tests/MAL-signatures_nogeom.stable.out
b/clients/Tests/MAL-signatures_nogeom.stable.out
--- a/clients/Tests/MAL-signatures_nogeom.stable.out
+++ b/clients/Tests/MAL-signatures_nogeom.stable.out
@@ -42245,6 +42245,10 @@ pattern sql.settimeout(s:lng):void
address CLTsetTimeout;
comment Abort query after s seconds
+pattern sql.sessions()
(user:bat[:oid,:str],start:bat[:oid,:timestamp],stimeout:bat[:oid,:lng],lastcmd:bat[:oid,:timestamp],qtimeout:bat[:oid,:lng],idle:bat[:oid,:bit])
+address sql_sessions_wrap;
+comment SQL export table of active sessions, their timeouts and idle status
+
pattern sql.sql_variables():bat[:oid,:str]
address sql_variables;
comment return the table with session variables
diff --git a/clients/Tests/SQL-dump.stable.out
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -213,6 +213,7 @@ SYSTEM FUNCTION sys.relate
SYSTEM FUNCTION sys.resume
SYSTEM FUNCTION sys.reuse
SYSTEM FUNCTION sys.reverse
+SYSTEM FUNCTION sys.sessions
SYSTEM FUNCTION sys.setmasklen
SYSTEM FUNCTION sys.setsession
SYSTEM FUNCTION sys.settimeout
@@ -1441,7 +1442,7 @@ CREATE TABLE "sys"."_columns" (
"number" INTEGER,
"storage" VARCHAR(2048)
);
-COPY 406 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS
'\t','\n','"';
+COPY 412 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS
'\t','\n','"';
2002 "id" "int" 32 0 2001 NULL true 0 NULL
2003 "name" "varchar" 1024 0 2001 NULL true 1
NULL
2004 "authorization" "int" 32 0 2001 NULL true 2
NULL
@@ -1735,119 +1736,125 @@ 5527 "dep_type" "varchar" 32 0
5524 NULL
5532 "sch" "varchar" 100 0 5531 NULL true 0
NULL
5533 "usr" "varchar" 100 0 5531 NULL true 1
NULL
5534 "dep_type" "varchar" 32 0 5531 NULL true
2 NULL
-5595 "rewrite" "clob" 0 0 5594 NULL true 0
NULL
-5596 "count" "int" 32 0 5594 NULL true 1 NULL
-5601 "query" "clob" 0 0 5600 NULL true 0 NULL
-5602 "count" "int" 32 0 5600 NULL true 1 NULL
-5610 "name" "clob" 0 0 5609 NULL true 0 NULL
-5611 "def" "clob" 0 0 5609 NULL true 1 NULL
-5612 "status" "clob" 0 0 5609 NULL true 2
NULL
-5617 "name" "clob" 0 0 5620 NULL true 0 NULL
-5618 "def" "clob" 0 0 5620 NULL true 1 NULL
-5619 "status" "clob" 0 0 5620 NULL true 2
NULL
-5622 "name" "clob" 0 0 5621 NULL true 0 NULL
-5623 "value" "clob" 0 0 5621 NULL true 1 NULL
-5628 "name" "clob" 0 0 5630 NULL true 0 NULL
-5629 "value" "clob" 0 0 5630 NULL true 1 NULL
-5632 "id" "int" 32 0 5631 NULL true 0 NULL
-5633 "name" "clob" 0 0 5631 NULL true 1 NULL
-5634 "htype" "clob" 0 0 5631 NULL true 2 NULL
-5635 "ttype" "clob" 0 0 5631 NULL true 3 NULL
-5636 "count" "bigint" 64 0 5631 NULL true 4
NULL
-5637 "refcnt" "int" 32 0 5631 NULL true 5
NULL
-5638 "lrefcnt" "int" 32 0 5631 NULL true 6
NULL
-5639 "location" "clob" 0 0 5631 NULL true 7
NULL
-5640 "heat" "int" 32 0 5631 NULL true 8 NULL
-5641 "dirty" "clob" 0 0 5631 NULL true 9 NULL
-5642 "status" "clob" 0 0 5631 NULL true 10
NULL
-5643 "kind" "clob" 0 0 5631 NULL true 11 NULL
-5652 "qtag" "bigint" 64 0 5651 NULL true 0
NULL
-5653 "user" "clob" 0 0 5651 NULL true 1 NULL
-5654 "started" "timestamp" 7 0 5651 NULL true
2 NULL
-5655 "estimate" "timestamp" 7 0 5651 NULL true
3 NULL
-5656 "progress" "int" 32 0 5651 NULL true 4
NULL
-5657 "status" "clob" 0 0 5651 NULL true 5
NULL
-5658 "tag" "oid" 63 0 5651 NULL true 6 NULL
-5659 "query" "clob" 0 0 5651 NULL true 7 NULL
-5664 "qtag" "bigint" 64 0 5672 NULL true 0
NULL
-5665 "user" "clob" 0 0 5672 NULL true 1 NULL
-5666 "started" "timestamp" 7 0 5672 NULL true
2 NULL
-5667 "estimate" "timestamp" 7 0 5672 NULL true
3 NULL
-5668 "progress" "int" 32 0 5672 NULL true 4
NULL
-5669 "status" "clob" 0 0 5672 NULL true 5
NULL
-5670 "tag" "oid" 63 0 5672 NULL true 6 NULL
-5671 "query" "clob" 0 0 5672 NULL true 7 NULL
-6176 "schema" "clob" 0 0 6175 NULL true 0
NULL
-6177 "table" "clob" 0 0 6175 NULL true 1 NULL
-6178 "column" "clob" 0 0 6175 NULL true 2
NULL
-6179 "type" "clob" 0 0 6175 NULL true 3 NULL
-6180 "location" "clob" 0 0 6175 NULL true 4
NULL
-6181 "count" "bigint" 64 0 6175 NULL true 5
NULL
-6182 "typewidth" "int" 32 0 6175 NULL true 6
NULL
-6183 "columnsize" "bigint" 64 0 6175 NULL true
7 NULL
-6184 "heapsize" "bigint" 64 0 6175 NULL true
8 NULL
-6185 "indices" "bigint" 64 0 6175 NULL true
9 NULL
-6186 "sorted" "boolean" 1 0 6175 NULL true
10 NULL
-6191 "schema" "clob" 0 0 6202 NULL true 0
NULL
-6192 "table" "clob" 0 0 6202 NULL true 1 NULL
-6193 "column" "clob" 0 0 6202 NULL true 2
NULL
-6194 "type" "clob" 0 0 6202 NULL true 3 NULL
-6195 "location" "clob" 0 0 6202 NULL true 4
NULL
-6196 "count" "bigint" 64 0 6202 NULL true 5
NULL
-6197 "typewidth" "int" 32 0 6202 NULL true 6
NULL
-6198 "columnsize" "bigint" 64 0 6202 NULL true
7 NULL
-6199 "heapsize" "bigint" 64 0 6202 NULL true
8 NULL
-6200 "indices" "bigint" 64 0 6202 NULL true
9 NULL
-6201 "sorted" "boolean" 1 0 6202 NULL true
10 NULL
-6204 "schema" "clob" 0 0 6214 NULL true 0
NULL
-6205 "table" "clob" 0 0 6214 NULL true 1 NULL
-6206 "column" "clob" 0 0 6214 NULL true 2
NULL
-6207 "type" "clob" 0 0 6214 NULL true 3 NULL
-6208 "typewidth" "int" 32 0 6214 NULL true 4
NULL
-6209 "count" "bigint" 64 0 6214 NULL true 5
NULL
-6210 "distinct" "bigint" 64 0 6214 NULL true
6 NULL
-6211 "atomwidth" "int" 32 0 6214 NULL true 7
NULL
-6212 "reference" "boolean" 1 0 6214 NULL true
8 NULL
-6213 "sorted" "boolean" 1 0 6214 NULL true
9 NULL
-6235 "schema" "clob" 0 0 6234 NULL true 0
NULL
-6236 "table" "clob" 0 0 6234 NULL true 1 NULL
-6237 "column" "clob" 0 0 6234 NULL true 2
NULL
-6238 "type" "clob" 0 0 6234 NULL true 3 NULL
-6239 "count" "bigint" 64 0 6234 NULL true 4
NULL
-6240 "columnsize" "bigint" 64 0 6234 NULL true
5 NULL
-6241 "heapsize" "bigint" 64 0 6234 NULL true
6 NULL
-6242 "indices" "bigint" 64 0 6234 NULL true
7 NULL
-6243 "sorted" "boolean" 1 0 6234 NULL true
8 NULL
-6248 "schema" "clob" 0 0 6257 NULL true 0
NULL
-6249 "table" "clob" 0 0 6257 NULL true 1 NULL
-6250 "column" "clob" 0 0 6257 NULL true 2
NULL
-6251 "type" "clob" 0 0 6257 NULL true 3 NULL
-6252 "count" "bigint" 64 0 6257 NULL true 4
NULL
-6253 "columnsize" "bigint" 64 0 6257 NULL true
5 NULL
-6254 "heapsize" "bigint" 64 0 6257 NULL true
6 NULL
-6255 "indices" "bigint" 64 0 6257 NULL true
7 NULL
-6256 "sorted" "boolean" 1 0 6257 NULL true
8 NULL
-6259 "schema" "clob" 0 0 6266 NULL true 0
NULL
-6260 "table" "clob" 0 0 6266 NULL true 1 NULL
-6261 "count" "bigint" 64 0 6266 NULL true 2
NULL
-6262 "columnsize" "bigint" 64 0 6266 NULL true
3 NULL
-6263 "heapsize" "bigint" 64 0 6266 NULL true
4 NULL
-6264 "indices" "bigint" 64 0 6266 NULL true
5 NULL
-6265 "auxillary" "bigint" 53 0 6266 NULL true
6 NULL
-6268 "schema" "clob" 0 0 6281 NULL true 0
NULL
-6269 "table" "clob" 0 0 6281 NULL true 1 NULL
-6270 "column" "clob" 0 0 6281 NULL true 2
NULL
-6271 "type" "clob" 0 0 6281 NULL true 3 NULL
-6272 "width" "int" 32 0 6281 NULL true 4 NULL
-6273 "stamp" "timestamp" 7 0 6281 NULL true 5
NULL
-6274 "sample" "bigint" 64 0 6281 NULL true
6 NULL
-6275 "count" "bigint" 64 0 6281 NULL true 7
NULL
-6276 "unique" "bigint" 64 0 6281 NULL true
8 NULL
-6277 "nils" "bigint" 64 0 6281 NULL true 9
NULL
-6278 "minval" "clob" 0 0 6281 NULL true 10
NULL
-6279 "maxval" "clob" 0 0 6281 NULL true 11
NULL
-6280 "sorted" "boolean" 1 0 6281 NULL true
12 NULL
-6334 "function_id" "int" 32 0 6335 NULL true 0
NULL
+5543 "user" "clob" 0 0 5542 NULL true 0 NULL
+5544 "login" "timestamp" 7 0 5542 NULL true 1
NULL
+5545 "sessiontimeout" "bigint" 64 0 5542 NULL
true 2 NULL
+5546 "lastcommand" "timestamp" 7 0 5542 NULL true
3 NULL
+5547 "querytimeout" "bigint" 64 0 5542 NULL true
4 NULL
+5548 "active" "boolean" 1 0 5542 NULL true
5 NULL
+5605 "rewrite" "clob" 0 0 5604 NULL true 0
NULL
+5606 "count" "int" 32 0 5604 NULL true 1 NULL
+5611 "query" "clob" 0 0 5610 NULL true 0 NULL
+5612 "count" "int" 32 0 5610 NULL true 1 NULL
+5620 "name" "clob" 0 0 5619 NULL true 0 NULL
+5621 "def" "clob" 0 0 5619 NULL true 1 NULL
+5622 "status" "clob" 0 0 5619 NULL true 2
NULL
+5627 "name" "clob" 0 0 5630 NULL true 0 NULL
+5628 "def" "clob" 0 0 5630 NULL true 1 NULL
+5629 "status" "clob" 0 0 5630 NULL true 2
NULL
+5632 "name" "clob" 0 0 5631 NULL true 0 NULL
+5633 "value" "clob" 0 0 5631 NULL true 1 NULL
+5638 "name" "clob" 0 0 5640 NULL true 0 NULL
+5639 "value" "clob" 0 0 5640 NULL true 1 NULL
+5642 "id" "int" 32 0 5641 NULL true 0 NULL
+5643 "name" "clob" 0 0 5641 NULL true 1 NULL
+5644 "htype" "clob" 0 0 5641 NULL true 2 NULL
+5645 "ttype" "clob" 0 0 5641 NULL true 3 NULL
+5646 "count" "bigint" 64 0 5641 NULL true 4
NULL
+5647 "refcnt" "int" 32 0 5641 NULL true 5
NULL
+5648 "lrefcnt" "int" 32 0 5641 NULL true 6
NULL
+5649 "location" "clob" 0 0 5641 NULL true 7
NULL
+5650 "heat" "int" 32 0 5641 NULL true 8 NULL
+5651 "dirty" "clob" 0 0 5641 NULL true 9 NULL
+5652 "status" "clob" 0 0 5641 NULL true 10
NULL
+5653 "kind" "clob" 0 0 5641 NULL true 11 NULL
+5662 "qtag" "bigint" 64 0 5661 NULL true 0
NULL
+5663 "user" "clob" 0 0 5661 NULL true 1 NULL
+5664 "started" "timestamp" 7 0 5661 NULL true
2 NULL
+5665 "estimate" "timestamp" 7 0 5661 NULL true
3 NULL
+5666 "progress" "int" 32 0 5661 NULL true 4
NULL
+5667 "status" "clob" 0 0 5661 NULL true 5
NULL
+5668 "tag" "oid" 63 0 5661 NULL true 6 NULL
+5669 "query" "clob" 0 0 5661 NULL true 7 NULL
+5674 "qtag" "bigint" 64 0 5682 NULL true 0
NULL
+5675 "user" "clob" 0 0 5682 NULL true 1 NULL
+5676 "started" "timestamp" 7 0 5682 NULL true
2 NULL
+5677 "estimate" "timestamp" 7 0 5682 NULL true
3 NULL
+5678 "progress" "int" 32 0 5682 NULL true 4
NULL
+5679 "status" "clob" 0 0 5682 NULL true 5
NULL
+5680 "tag" "oid" 63 0 5682 NULL true 6 NULL
+5681 "query" "clob" 0 0 5682 NULL true 7 NULL
+6186 "schema" "clob" 0 0 6185 NULL true 0
NULL
+6187 "table" "clob" 0 0 6185 NULL true 1 NULL
+6188 "column" "clob" 0 0 6185 NULL true 2
NULL
+6189 "type" "clob" 0 0 6185 NULL true 3 NULL
+6190 "location" "clob" 0 0 6185 NULL true 4
NULL
+6191 "count" "bigint" 64 0 6185 NULL true 5
NULL
+6192 "typewidth" "int" 32 0 6185 NULL true 6
NULL
+6193 "columnsize" "bigint" 64 0 6185 NULL true
7 NULL
+6194 "heapsize" "bigint" 64 0 6185 NULL true
8 NULL
+6195 "indices" "bigint" 64 0 6185 NULL true
9 NULL
+6196 "sorted" "boolean" 1 0 6185 NULL true
10 NULL
+6201 "schema" "clob" 0 0 6212 NULL true 0
NULL
+6202 "table" "clob" 0 0 6212 NULL true 1 NULL
+6203 "column" "clob" 0 0 6212 NULL true 2
NULL
+6204 "type" "clob" 0 0 6212 NULL true 3 NULL
+6205 "location" "clob" 0 0 6212 NULL true 4
NULL
+6206 "count" "bigint" 64 0 6212 NULL true 5
NULL
+6207 "typewidth" "int" 32 0 6212 NULL true 6
NULL
+6208 "columnsize" "bigint" 64 0 6212 NULL true
7 NULL
+6209 "heapsize" "bigint" 64 0 6212 NULL true
8 NULL
+6210 "indices" "bigint" 64 0 6212 NULL true
9 NULL
+6211 "sorted" "boolean" 1 0 6212 NULL true
10 NULL
+6214 "schema" "clob" 0 0 6224 NULL true 0
NULL
+6215 "table" "clob" 0 0 6224 NULL true 1 NULL
+6216 "column" "clob" 0 0 6224 NULL true 2
NULL
+6217 "type" "clob" 0 0 6224 NULL true 3 NULL
+6218 "typewidth" "int" 32 0 6224 NULL true 4
NULL
+6219 "count" "bigint" 64 0 6224 NULL true 5
NULL
+6220 "distinct" "bigint" 64 0 6224 NULL true
6 NULL
+6221 "atomwidth" "int" 32 0 6224 NULL true 7
NULL
+6222 "reference" "boolean" 1 0 6224 NULL true
8 NULL
+6223 "sorted" "boolean" 1 0 6224 NULL true
9 NULL
+6245 "schema" "clob" 0 0 6244 NULL true 0
NULL
+6246 "table" "clob" 0 0 6244 NULL true 1 NULL
+6247 "column" "clob" 0 0 6244 NULL true 2
NULL
+6248 "type" "clob" 0 0 6244 NULL true 3 NULL
+6249 "count" "bigint" 64 0 6244 NULL true 4
NULL
+6250 "columnsize" "bigint" 64 0 6244 NULL true
5 NULL
+6251 "heapsize" "bigint" 64 0 6244 NULL true
6 NULL
+6252 "indices" "bigint" 64 0 6244 NULL true
7 NULL
+6253 "sorted" "boolean" 1 0 6244 NULL true
8 NULL
+6258 "schema" "clob" 0 0 6267 NULL true 0
NULL
+6259 "table" "clob" 0 0 6267 NULL true 1 NULL
+6260 "column" "clob" 0 0 6267 NULL true 2
NULL
+6261 "type" "clob" 0 0 6267 NULL true 3 NULL
+6262 "count" "bigint" 64 0 6267 NULL true 4
NULL
+6263 "columnsize" "bigint" 64 0 6267 NULL true
5 NULL
+6264 "heapsize" "bigint" 64 0 6267 NULL true
6 NULL
+6265 "indices" "bigint" 64 0 6267 NULL true
7 NULL
+6266 "sorted" "boolean" 1 0 6267 NULL true
8 NULL
+6269 "schema" "clob" 0 0 6276 NULL true 0
NULL
+6270 "table" "clob" 0 0 6276 NULL true 1 NULL
+6271 "count" "bigint" 64 0 6276 NULL true 2
NULL
+6272 "columnsize" "bigint" 64 0 6276 NULL true
3 NULL
+6273 "heapsize" "bigint" 64 0 6276 NULL true
4 NULL
+6274 "indices" "bigint" 64 0 6276 NULL true
5 NULL
+6275 "auxillary" "bigint" 53 0 6276 NULL true
6 NULL
+6278 "schema" "clob" 0 0 6291 NULL true 0
NULL
+6279 "table" "clob" 0 0 6291 NULL true 1 NULL
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
