Changeset: c726eed8aa70 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c726eed8aa70 Modified Files: clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 Branch: Jul2015 Log Message:
Approved output after grafting changeset 4f422ce4c818. diffs (truncated from 8590 to 300 lines): 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 @@ -1481,225 +1481,225 @@ 5212 "system" "boolean" 1 0 5206 NULL tr 5213 "commit_action" "smallint" 16 0 5206 NULL true 6 NULL 5214 "access" "smallint" 16 0 5206 NULL true 7 NULL 5215 "temporary" "smallint" 16 0 5206 NULL true 8 NULL -5218 "id" "int" 32 0 5217 NULL true 0 NULL -5219 "name" "varchar" 1024 0 5217 NULL true 1 NULL -5220 "type" "varchar" 1024 0 5217 NULL true 2 NULL -5221 "type_digits" "int" 32 0 5217 NULL true 3 NULL -5222 "type_scale" "int" 32 0 5217 NULL true 4 NULL -5223 "table_id" "int" 32 0 5217 NULL true 5 NULL -5224 "default" "varchar" 2048 0 5217 NULL true 6 NULL -5225 "null" "boolean" 1 0 5217 NULL true 7 NULL -5226 "number" "int" 32 0 5217 NULL true 8 NULL -5227 "storage" "varchar" 2048 0 5217 NULL true 9 NULL -5234 "name" "varchar" 1024 0 5233 NULL true 0 NULL -5235 "fullname" "varchar" 2048 0 5233 NULL true 1 NULL -5236 "default_schema" "int" 9 0 5233 NULL true 2 NULL -5240 "name" "varchar" 1024 0 5239 NULL true 0 NULL -5241 "fullname" "varchar" 2024 0 5239 NULL true 1 NULL -5242 "default_schema" "int" 9 0 5239 NULL true 2 NULL -5244 "login_id" "int" 32 0 5243 NULL true 0 NULL -5245 "role_id" "int" 32 0 5243 NULL true 1 NULL -5247 "id" "int" 32 0 5246 NULL true 0 NULL -5248 "name" "varchar" 1024 0 5246 NULL true 1 NULL -5249 "grantor" "int" 32 0 5246 NULL true 2 NULL -5251 "obj_id" "int" 32 0 5250 NULL true 0 NULL -5252 "auth_id" "int" 32 0 5250 NULL true 1 NULL -5253 "privileges" "int" 32 0 5250 NULL true 2 NULL -5254 "grantor" "int" 32 0 5250 NULL true 3 NULL -5255 "grantable" "int" 32 0 5250 NULL true 4 NULL -5464 "id" "oid" 63 0 5472 NULL true 0 NULL -5465 "owner" "clob" 0 0 5472 NULL true 1 NULL -5466 "defined" "timestamp" 7 0 5472 NULL true 2 NULL -5467 "query" "clob" 0 0 5472 NULL true 3 NULL -5468 "pipe" "clob" 0 0 5472 NULL true 4 NULL -5469 "plan" "clob" 0 0 5472 NULL true 5 NULL -5470 "mal" "int" 32 0 5472 NULL true 6 NULL -5471 "optimize" "bigint" 64 0 5472 NULL true 7 NULL -5474 "id" "oid" 63 0 5483 NULL true 0 NULL -5475 "start" "timestamp" 7 0 5483 NULL true 1 NULL -5476 "stop" "timestamp" 7 0 5483 NULL true 2 NULL -5477 "arguments" "clob" 0 0 5483 NULL true 3 NULL -5478 "tuples" "wrd" 64 0 5483 NULL true 4 NULL -5479 "run" "bigint" 64 0 5483 NULL true 5 NULL -5480 "ship" "bigint" 64 0 5483 NULL true 6 NULL -5481 "cpu" "int" 32 0 5483 NULL true 7 NULL -5482 "io" "int" 32 0 5483 NULL true 8 NULL -5485 "id" "oid" 63 0 5501 NULL true 0 NULL -5486 "owner" "clob" 0 0 5501 NULL true 1 NULL -5487 "defined" "timestamp" 7 0 5501 NULL true 2 NULL -5488 "query" "clob" 0 0 5501 NULL true 3 NULL -5489 "pipe" "clob" 0 0 5501 NULL true 4 NULL -5490 "plan" "clob" 0 0 5501 NULL true 5 NULL -5491 "mal" "int" 32 0 5501 NULL true 6 NULL -5492 "optimize" "bigint" 64 0 5501 NULL true 7 NULL -5493 "start" "timestamp" 7 0 5501 NULL true 8 NULL -5494 "stop" "timestamp" 7 0 5501 NULL true 9 NULL -5495 "arguments" "clob" 0 0 5501 NULL true 10 NULL -5496 "tuples" "wrd" 64 0 5501 NULL true 11 NULL -5497 "run" "bigint" 64 0 5501 NULL true 12 NULL -5498 "ship" "bigint" 64 0 5501 NULL true 13 NULL -5499 "cpu" "int" 32 0 5501 NULL true 14 NULL -5500 "io" "int" 32 0 5501 NULL true 15 NULL -5527 "event" "int" 32 0 5540 NULL true 0 NULL -5528 "clk" "varchar" 20 0 5540 NULL true 1 NULL -5529 "pc" "varchar" 50 0 5540 NULL true 2 NULL -5530 "thread" "int" 32 0 5540 NULL true 3 NULL -5531 "ticks" "bigint" 64 0 5540 NULL true 4 NULL -5532 "rrsmb" "bigint" 64 0 5540 NULL true 5 NULL -5533 "vmmb" "bigint" 64 0 5540 NULL true 6 NULL -5534 "reads" "bigint" 64 0 5540 NULL true 7 NULL -5535 "writes" "bigint" 64 0 5540 NULL true 8 NULL -5536 "minflt" "bigint" 64 0 5540 NULL true 9 NULL -5537 "majflt" "bigint" 64 0 5540 NULL true 10 NULL -5538 "nvcsw" "bigint" 64 0 5540 NULL true 11 NULL -5539 "stmt" "clob" 0 0 5540 NULL true 12 NULL -5670 "user" "clob" 0 0 5676 NULL true 0 NULL -5671 "login" "timestamp" 7 0 5676 NULL true 1 NULL -5672 "sessiontimeout" "bigint" 64 0 5676 NULL true 2 NULL -5673 "lastcommand" "timestamp" 7 0 5676 NULL true 3 NULL -5674 "querytimeout" "bigint" 64 0 5676 NULL true 4 NULL -5675 "active" "boolean" 1 0 5676 NULL true 5 NULL -5753 "name" "clob" 0 0 5756 NULL true 0 NULL -5754 "def" "clob" 0 0 5756 NULL true 1 NULL -5755 "status" "clob" 0 0 5756 NULL true 2 NULL -5762 "name" "clob" 0 0 5764 NULL true 0 NULL -5763 "value" "clob" 0 0 5764 NULL true 1 NULL -5794 "qtag" "bigint" 64 0 5802 NULL true 0 NULL -5795 "user" "clob" 0 0 5802 NULL true 1 NULL -5796 "started" "timestamp" 7 0 5802 NULL true 2 NULL -5797 "estimate" "timestamp" 7 0 5802 NULL true 3 NULL -5798 "progress" "int" 32 0 5802 NULL true 4 NULL -5799 "status" "clob" 0 0 5802 NULL true 5 NULL -5800 "tag" "oid" 63 0 5802 NULL true 6 NULL -5801 "query" "clob" 0 0 5802 NULL true 7 NULL -5828 "rowid" "bigint" 64 0 5832 NULL true 0 NULL -5829 "fldid" "int" 32 0 5832 NULL true 1 NULL -5830 "message" "clob" 0 0 5832 NULL true 2 NULL -5831 "input" "clob" 0 0 5832 NULL true 3 NULL -6452 "keyword" "varchar" 40 0 6455 NULL false 0 NULL -6457 "table_type_id" "smallint" 16 0 6463 NULL false 0 NULL -6460 "table_type_name" "varchar" 25 0 6463 NULL false 1 NULL -6465 "dependency_type_id" "smallint" 16 0 6471 NULL false 0 NULL -6468 "dependency_type_name" "varchar" 15 0 6471 NULL false 1 NULL -6486 "file_id" "int" 32 0 6488 NULL true 0 NULL -6487 "location" "char" 256 0 6488 NULL true 1 NULL -6490 "dim_id" "int" 32 0 6494 NULL true 0 NULL -6491 "file_id" "int" 32 0 6494 NULL true 1 NULL -6492 "name" "varchar" 64 0 6494 NULL true 2 NULL -6493 "length" "int" 32 0 6494 NULL true 3 NULL -6496 "var_id" "int" 32 0 6502 NULL true 0 NULL -6497 "file_id" "int" 32 0 6502 NULL true 1 NULL -6498 "name" "varchar" 64 0 6502 NULL true 2 NULL -6499 "vartype" "varchar" 64 0 6502 NULL true 3 NULL -6500 "ndim" "int" 32 0 6502 NULL true 4 NULL -6501 "coord_dim_id" "int" 32 0 6502 NULL true 5 NULL -6504 "var_id" "int" 32 0 6508 NULL true 0 NULL -6505 "dim_id" "int" 32 0 6508 NULL true 1 NULL -6506 "file_id" "int" 32 0 6508 NULL true 2 NULL -6507 "dimpos" "int" 32 0 6508 NULL true 3 NULL -6510 "obj_name" "varchar" 256 0 6516 NULL true 0 NULL -6511 "att_name" "varchar" 256 0 6516 NULL true 1 NULL -6512 "att_type" "varchar" 64 0 6516 NULL true 2 NULL -6513 "value" "clob" 0 0 6516 NULL true 3 NULL -6514 "file_id" "int" 32 0 6516 NULL true 4 NULL -6515 "gr_name" "varchar" 256 0 6516 NULL true 5 NULL -6541 "schema" "clob" 0 0 6555 NULL true 0 NULL -6542 "table" "clob" 0 0 6555 NULL true 1 NULL -6543 "column" "clob" 0 0 6555 NULL true 2 NULL -6544 "type" "clob" 0 0 6555 NULL true 3 NULL -6545 "mode" "clob" 0 0 6555 NULL true 4 NULL -6546 "location" "clob" 0 0 6555 NULL true 5 NULL -6547 "count" "bigint" 64 0 6555 NULL true 6 NULL -6548 "typewidth" "int" 32 0 6555 NULL true 7 NULL -6549 "columnsize" "bigint" 64 0 6555 NULL true 8 NULL -6550 "heapsize" "bigint" 64 0 6555 NULL true 9 NULL -6551 "hashes" "bigint" 64 0 6555 NULL true 10 NULL -6552 "phash" "boolean" 1 0 6555 NULL true 11 NULL -6553 "imprints" "bigint" 64 0 6555 NULL true 12 NULL -6554 "sorted" "boolean" 1 0 6555 NULL true 13 NULL -6557 "schema" "clob" 0 0 6567 NULL true 0 NULL -6558 "table" "clob" 0 0 6567 NULL true 1 NULL -6559 "column" "clob" 0 0 6567 NULL true 2 NULL -6560 "type" "clob" 0 0 6567 NULL true 3 NULL -6561 "typewidth" "int" 32 0 6567 NULL true 4 NULL -6562 "count" "bigint" 64 0 6567 NULL true 5 NULL -6563 "distinct" "bigint" 64 0 6567 NULL true 6 NULL -6564 "atomwidth" "int" 32 0 6567 NULL true 7 NULL -6565 "reference" "boolean" 1 0 6567 NULL true 8 NULL -6566 "sorted" "boolean" 1 0 6567 NULL true 9 NULL -6605 "schema" "clob" 0 0 6615 NULL true 0 NULL -6606 "table" "clob" 0 0 6615 NULL true 1 NULL -6607 "column" "clob" 0 0 6615 NULL true 2 NULL -6608 "type" "clob" 0 0 6615 NULL true 3 NULL -6609 "count" "bigint" 64 0 6615 NULL true 4 NULL -6610 "columnsize" "bigint" 64 0 6615 NULL true 5 NULL -6611 "heapsize" "bigint" 64 0 6615 NULL true 6 NULL -6612 "hashes" "bigint" 64 0 6615 NULL true 7 NULL -6613 "imprints" "bigint" 64 0 6615 NULL true 8 NULL -6614 "sorted" "boolean" 1 0 6615 NULL true 9 NULL -6617 "schema" "clob" 0 0 6625 NULL true 0 NULL -6618 "table" "clob" 0 0 6625 NULL true 1 NULL -6619 "count" "bigint" 64 0 6625 NULL true 2 NULL -6620 "columnsize" "bigint" 64 0 6625 NULL true 3 NULL -6621 "heapsize" "bigint" 64 0 6625 NULL true 4 NULL -6622 "hashes" "bigint" 64 0 6625 NULL true 5 NULL -6623 "imprints" "bigint" 64 0 6625 NULL true 6 NULL -6624 "auxiliary" "bigint" 64 0 6625 NULL true 7 NULL -6627 "column_id" "int" 32 0 6638 NULL true 0 NULL -6628 "type" "clob" 0 0 6638 NULL true 1 NULL -6629 "width" "int" 32 0 6638 NULL true 2 NULL -6630 "stamp" "timestamp" 7 0 6638 NULL true 3 NULL -6631 "sample" "bigint" 64 0 6638 NULL true 4 NULL -6632 "count" "bigint" 64 0 6638 NULL true 5 NULL -6633 "unique" "bigint" 64 0 6638 NULL true 6 NULL -6634 "nils" "bigint" 64 0 6638 NULL true 7 NULL -6635 "minval" "clob" 0 0 6638 NULL true 8 NULL -6636 "maxval" "clob" 0 0 6638 NULL true 9 NULL -6637 "sorted" "boolean" 1 0 6638 NULL true 10 NULL -6723 "file_id" "bigint" 64 0 6731 NULL false 0 NULL -6724 "file_location" "clob" 0 0 6731 NULL false 1 NULL -6725 "dbschema" "smallint" 16 0 6731 NULL false 2 NULL -6726 "format_version" "varchar" 7 0 6731 NULL true 3 NULL -6727 "sorting_order" "varchar" 10 0 6731 NULL true 4 NULL -6728 "comments" "clob" 0 0 6731 NULL true 5 NULL -6733 "sn" "clob" 0 0 6744 NULL false 0 NULL -6734 "file_id" "bigint" 64 0 6744 NULL false 1 NULL -6735 "ln" "int" 32 0 6744 NULL true 2 NULL -6736 "as" "int" 32 0 6744 NULL true 3 NULL -6737 "m5" "clob" 0 0 6744 NULL true 4 NULL -6738 "sp" "clob" 0 0 6744 NULL true 5 NULL -6739 "ur" "clob" 0 0 6744 NULL true 6 NULL -6746 "id" "clob" 0 0 6763 NULL false 0 NULL -6747 "file_id" "bigint" 64 0 6763 NULL false 1 NULL -6748 "cn" "clob" 0 0 6763 NULL true 2 NULL -6749 "ds" "clob" 0 0 6763 NULL true 3 NULL -6750 "dt" "timestamp" 7 0 6763 NULL true 4 NULL -6751 "fo" "clob" 0 0 6763 NULL true 5 NULL -6752 "ks" "clob" 0 0 6763 NULL true 6 NULL -6753 "lb" "clob" 0 0 6763 NULL true 7 NULL -6754 "pg" "clob" 0 0 6763 NULL true 8 NULL -6755 "pi" "int" 32 0 6763 NULL true 9 NULL -6756 "pl" "clob" 0 0 6763 NULL true 10 NULL -6757 "pu" "clob" 0 0 6763 NULL true 11 NULL -6758 "sm" "clob" 0 0 6763 NULL true 12 NULL -6765 "id" "clob" 0 0 6775 NULL false 0 NULL -6766 "file_id" "bigint" 64 0 6775 NULL false 1 NULL -6767 "pn" "clob" 0 0 6775 NULL true 2 NULL -6768 "cl" "clob" 0 0 6775 NULL true 3 NULL -6769 "pp" "clob" 0 0 6775 NULL true 4 NULL -6770 "vn" "clob" 0 0 6775 NULL true 5 NULL -6777 "qname" "clob" 0 0 6788 NULL false 0 NULL -6778 "flag" "smallint" 16 0 6788 NULL false 1 NULL -6779 "rname" "clob" 0 0 6788 NULL false 2 NULL -6780 "pos" "int" 32 0 6788 NULL false 3 NULL -6781 "mapq" "smallint" 16 0 6788 NULL false 4 NULL -6782 "cigar" "clob" 0 0 6788 NULL false 5 NULL -6783 "rnext" "clob" 0 0 6788 NULL false 6 NULL -6784 "pnext" "int" 32 0 6788 NULL false 7 NULL -6785 "tlen" "int" 32 0 6788 NULL false 8 NULL -6786 "seq" "clob" 0 0 6788 NULL false 9 NULL -6787 "qual" "clob" 0 0 6788 NULL false 10 NULL -6858 "function_id" "int" 32 0 6859 NULL true 0 NULL +5217 "id" "int" 32 0 5216 NULL true 0 NULL +5218 "name" "varchar" 1024 0 5216 NULL true 1 NULL +5219 "type" "varchar" 1024 0 5216 NULL true 2 NULL +5220 "type_digits" "int" 32 0 5216 NULL true 3 NULL +5221 "type_scale" "int" 32 0 5216 NULL true 4 NULL +5222 "table_id" "int" 32 0 5216 NULL true 5 NULL +5223 "default" "varchar" 2048 0 5216 NULL true 6 NULL +5224 "null" "boolean" 1 0 5216 NULL true 7 NULL +5225 "number" "int" 32 0 5216 NULL true 8 NULL +5226 "storage" "varchar" 2048 0 5216 NULL true 9 NULL +5233 "name" "varchar" 1024 0 5232 NULL true 0 NULL +5234 "fullname" "varchar" 2048 0 5232 NULL true 1 NULL +5235 "default_schema" "int" 9 0 5232 NULL true 2 NULL +5239 "name" "varchar" 1024 0 5238 NULL true 0 NULL +5240 "fullname" "varchar" 2024 0 5238 NULL true 1 NULL +5241 "default_schema" "int" 9 0 5238 NULL true 2 NULL +5243 "login_id" "int" 32 0 5242 NULL true 0 NULL +5244 "role_id" "int" 32 0 5242 NULL true 1 NULL +5246 "id" "int" 32 0 5245 NULL true 0 NULL +5247 "name" "varchar" 1024 0 5245 NULL true 1 NULL +5248 "grantor" "int" 32 0 5245 NULL true 2 NULL +5250 "obj_id" "int" 32 0 5249 NULL true 0 NULL +5251 "auth_id" "int" 32 0 5249 NULL true 1 NULL +5252 "privileges" "int" 32 0 5249 NULL true 2 NULL +5253 "grantor" "int" 32 0 5249 NULL true 3 NULL +5254 "grantable" "int" 32 0 5249 NULL true 4 NULL +5463 "id" "oid" 63 0 5471 NULL true 0 NULL +5464 "owner" "clob" 0 0 5471 NULL true 1 NULL +5465 "defined" "timestamp" 7 0 5471 NULL true 2 NULL +5466 "query" "clob" 0 0 5471 NULL true 3 NULL +5467 "pipe" "clob" 0 0 5471 NULL true 4 NULL +5468 "plan" "clob" 0 0 5471 NULL true 5 NULL +5469 "mal" "int" 32 0 5471 NULL true 6 NULL +5470 "optimize" "bigint" 64 0 5471 NULL true 7 NULL +5473 "id" "oid" 63 0 5482 NULL true 0 NULL +5474 "start" "timestamp" 7 0 5482 NULL true 1 NULL +5475 "stop" "timestamp" 7 0 5482 NULL true 2 NULL +5476 "arguments" "clob" 0 0 5482 NULL true 3 NULL +5477 "tuples" "wrd" 64 0 5482 NULL true 4 NULL +5478 "run" "bigint" 64 0 5482 NULL true 5 NULL +5479 "ship" "bigint" 64 0 5482 NULL true 6 NULL +5480 "cpu" "int" 32 0 5482 NULL true 7 NULL +5481 "io" "int" 32 0 5482 NULL true 8 NULL +5484 "id" "oid" 63 0 5500 NULL true 0 NULL +5485 "owner" "clob" 0 0 5500 NULL true 1 NULL +5486 "defined" "timestamp" 7 0 5500 NULL true 2 NULL +5487 "query" "clob" 0 0 5500 NULL true 3 NULL +5488 "pipe" "clob" 0 0 5500 NULL true 4 NULL +5489 "plan" "clob" 0 0 5500 NULL true 5 NULL +5490 "mal" "int" 32 0 5500 NULL true 6 NULL +5491 "optimize" "bigint" 64 0 5500 NULL true 7 NULL +5492 "start" "timestamp" 7 0 5500 NULL true 8 NULL +5493 "stop" "timestamp" 7 0 5500 NULL true 9 NULL +5494 "arguments" "clob" 0 0 5500 NULL true 10 NULL +5495 "tuples" "wrd" 64 0 5500 NULL true 11 NULL +5496 "run" "bigint" 64 0 5500 NULL true 12 NULL +5497 "ship" "bigint" 64 0 5500 NULL true 13 NULL +5498 "cpu" "int" 32 0 5500 NULL true 14 NULL +5499 "io" "int" 32 0 5500 NULL true 15 NULL +5526 "event" "int" 32 0 5539 NULL true 0 NULL +5527 "clk" "varchar" 20 0 5539 NULL true 1 NULL +5528 "pc" "varchar" 50 0 5539 NULL true 2 NULL +5529 "thread" "int" 32 0 5539 NULL true 3 NULL +5530 "ticks" "bigint" 64 0 5539 NULL true 4 NULL +5531 "rrsmb" "bigint" 64 0 5539 NULL true 5 NULL +5532 "vmmb" "bigint" 64 0 5539 NULL true 6 NULL +5533 "reads" "bigint" 64 0 5539 NULL true 7 NULL +5534 "writes" "bigint" 64 0 5539 NULL true 8 NULL +5535 "minflt" "bigint" 64 0 5539 NULL true 9 NULL +5536 "majflt" "bigint" 64 0 5539 NULL true 10 NULL +5537 "nvcsw" "bigint" 64 0 5539 NULL true 11 NULL +5538 "stmt" "clob" 0 0 5539 NULL true 12 NULL +5673 "user" "clob" 0 0 5679 NULL true 0 NULL +5674 "login" "timestamp" 7 0 5679 NULL true 1 NULL _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list