Changeset: 99ca2afc23d4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=99ca2afc23d4
Modified Files:
MonetDB.spec
buildtools/selinux/monetdb.te
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: default
Log Message:
Merge with Jul2017 branch.
diffs (truncated from 39501 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -998,6 +998,7 @@ fi
make %{?_smp_mflags}
+%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
cd buildtools/selinux
for selinuxvariant in %{selinux_variants}
do
@@ -1006,6 +1007,7 @@ do
make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
done
cd -
+%endif
%install
%make_install
@@ -1022,6 +1024,7 @@ rm -f %{buildroot}%{_libdir}/monetdb5/*.
# internal development stuff
rm -f %{buildroot}%{_bindir}/Maddlog
+%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
for selinuxvariant in %{selinux_variants}
do
install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
@@ -1029,6 +1032,7 @@ do
%{buildroot}%{_datadir}/selinux/${selinuxvariant}/monetdb.pp
done
/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
+%endif
%post -p /sbin/ldconfig
diff --git a/buildtools/selinux/monetdb.te b/buildtools/selinux/monetdb.te
--- a/buildtools/selinux/monetdb.te
+++ b/buildtools/selinux/monetdb.te
@@ -14,7 +14,7 @@ init_daemon_domain(monetdbd_t, monetdbd_
# mserver5_exec_t which must then transition to the mserver5_t domain
type mserver5_t; # mserver5 when run by monetdbd (monetdbd_t)
type mserver5_exec_t; # /usr/bin/mserver5
-application_domain(mserver5_t, mserver5_exec_t)
+init_daemon_domain(mserver5_t, mserver5_exec_t)
# see
https://selinuxproject.org/page/NB_Domain_and_Object_Transitions#Domain_Transition
allow monetdbd_t mserver5_t:process transition;
allow monetdbd_t mserver5_exec_t:file { execute open read getattr };
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -25,65 +25,9 @@ stdout of test 'upgrade` in directory 's
Ready.
-Running database upgrade commands:
-set schema "sys";
-delete from sys._columns where table_id = (select id from sys._tables where
name = 'connections' and schema_id = (select id from sys.schemas where name =
'sys'));
-delete from sys._tables where name = 'connections' and schema_id = (select id
from sys.schemas where name = 'sys');
-update sys.functions set side_effect = false where name in ('like', 'ilike')
and schema_id = (select id from sys.schemas where name = 'sys');
-drop function sys.malfunctions;
-create function sys.malfunctions() returns table("module" string, "function"
string, "signature" string, "address" string, "comment" string) external name
"manual"."functions";
-drop function sys.optimizer_stats();
-create function sys.optimizer_stats() returns table (optname string, count
int, timing bigint) external name inspect.optimizer_stats;
-insert into sys.systemfunctions (select id from sys.functions where name in
('malfunctions', 'optimizer_stats') and schema_id = (select id from sys.schemas
where name = 'sys') and id not in (select function_id from
sys.systemfunctions));
-create function profiler.getlimit() returns integer external name
profiler.getlimit;
-create procedure profiler.setlimit(lim integer) external name
profiler.setlimit;
-drop procedure profiler.setpoolsize;
-drop procedure profiler.setstream;
-insert into sys.systemfunctions (select id from sys.functions where name in
('getlimit', 'setlimit') and schema_id = (select id from sys.schemas where name
= 'profiler') and id not in (select function_id from sys.systemfunctions));
-ALTER TABLE sys.keywords SET READ ONLY;
-ALTER TABLE sys.table_types SET READ ONLY;
-ALTER TABLE sys.dependency_types SET READ ONLY;
-CREATE TABLE sys.function_types (
-function_type_id SMALLINT NOT NULL PRIMARY KEY,
-function_type_name VARCHAR(30) NOT NULL UNIQUE);
-INSERT INTO sys.function_types (function_type_id, function_type_name) VALUES
-(1, 'Scalar function'), (2, 'Procedure'), (3, 'Aggregate function'), (4,
'Filter function'), (5, 'Function returning a table'),
-(6, 'Analytic function'), (7, 'Loader function');
-ALTER TABLE sys.function_types SET READ ONLY;
-CREATE TABLE sys.function_languages (
-language_id SMALLINT NOT NULL PRIMARY KEY,
-language_name VARCHAR(20) NOT NULL UNIQUE);
-INSERT INTO sys.function_languages (language_id, language_name) VALUES
-(0, 'Internal C'), (1, 'MAL'), (2, 'SQL'), (3, 'R'), (6, 'Python'), (7,
'Python Mapped'), (8, 'Python2'), (9, 'Python2 Mapped'), (10, 'Python3'), (11,
'Python3 Mapped');
-ALTER TABLE sys.function_languages SET READ ONLY;
-CREATE TABLE sys.key_types (
-key_type_id SMALLINT NOT NULL PRIMARY KEY,
-key_type_name VARCHAR(15) NOT NULL UNIQUE);
-INSERT INTO sys.key_types (key_type_id, key_type_name) VALUES
-(0, 'Primary Key'), (1, 'Unique Key'), (2, 'Foreign Key');
-ALTER TABLE sys.key_types SET READ ONLY;
-CREATE TABLE sys.index_types (
-index_type_id SMALLINT NOT NULL PRIMARY KEY,
-index_type_name VARCHAR(25) NOT NULL UNIQUE);
-INSERT INTO sys.index_types (index_type_id, index_type_name) VALUES
-(0, 'Hash'), (1, 'Join'), (2, 'Order preserving hash'), (3, 'No-index'), (4,
'Imprint'), (5, 'Ordered');
-ALTER TABLE sys.index_types SET READ ONLY;
-CREATE TABLE sys.privilege_codes (
-privilege_code_id INT NOT NULL PRIMARY KEY,
-privilege_code_name VARCHAR(30) NOT NULL UNIQUE);
-INSERT INTO sys.privilege_codes (privilege_code_id, privilege_code_name) VALUES
-(1, 'SELECT'), (2, 'UPDATE'), (4, 'INSERT'), (8, 'DELETE'), (16, 'EXECUTE'),
(32, 'GRANT'),
-(3, 'SELECT,UPDATE'), (5, 'SELECT,INSERT'), (6, 'INSERT,UPDATE'), (7,
'SELECT,INSERT,UPDATE'),
-(9, 'SELECT,DELETE'), (10, 'UPDATE,DELETE'), (11, 'SELECT,UPDATE,DELETE'),
(12, 'INSERT,DELETE'),
-(13, 'SELECT,INSERT,DELETE'), (14, 'INSERT,UPDATE,DELETE'), (15,
'SELECT,INSERT,UPDATE,DELETE');
-ALTER TABLE sys.privilege_codes SET READ ONLY;
-update sys._tables set system = true where name in ('function_languages',
'function_types', 'index_types', 'key_types', 'privilege_codes') and schema_id
= (select id from sys.schemas where name = 'sys');
-delete from sys.systemfunctions where function_id not in (select id from
sys.functions);
-set schema "sys";
-
-# 15:26:18 >
-# 15:26:18 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-21187" "--port=38946"
-# 15:26:18 >
+# 13:33:15 >
+# 13:33:15 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-32047" "--port=35791"
+# 13:33:15 >
#select 1;
% .L2 # table_name
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
@@ -25,65 +25,9 @@ stdout of test 'upgrade` in directory 's
Ready.
-Running database upgrade commands:
-set schema "sys";
-delete from sys._columns where table_id = (select id from sys._tables where
name = 'connections' and schema_id = (select id from sys.schemas where name =
'sys'));
-delete from sys._tables where name = 'connections' and schema_id = (select id
from sys.schemas where name = 'sys');
-update sys.functions set side_effect = false where name in ('like', 'ilike')
and schema_id = (select id from sys.schemas where name = 'sys');
-drop function sys.malfunctions;
-create function sys.malfunctions() returns table("module" string, "function"
string, "signature" string, "address" string, "comment" string) external name
"manual"."functions";
-drop function sys.optimizer_stats();
-create function sys.optimizer_stats() returns table (optname string, count
int, timing bigint) external name inspect.optimizer_stats;
-insert into sys.systemfunctions (select id from sys.functions where name in
('malfunctions', 'optimizer_stats') and schema_id = (select id from sys.schemas
where name = 'sys') and id not in (select function_id from
sys.systemfunctions));
-create function profiler.getlimit() returns integer external name
profiler.getlimit;
-create procedure profiler.setlimit(lim integer) external name
profiler.setlimit;
-drop procedure profiler.setpoolsize;
-drop procedure profiler.setstream;
-insert into sys.systemfunctions (select id from sys.functions where name in
('getlimit', 'setlimit') and schema_id = (select id from sys.schemas where name
= 'profiler') and id not in (select function_id from sys.systemfunctions));
-ALTER TABLE sys.keywords SET READ ONLY;
-ALTER TABLE sys.table_types SET READ ONLY;
-ALTER TABLE sys.dependency_types SET READ ONLY;
-CREATE TABLE sys.function_types (
-function_type_id SMALLINT NOT NULL PRIMARY KEY,
-function_type_name VARCHAR(30) NOT NULL UNIQUE);
-INSERT INTO sys.function_types (function_type_id, function_type_name) VALUES
-(1, 'Scalar function'), (2, 'Procedure'), (3, 'Aggregate function'), (4,
'Filter function'), (5, 'Function returning a table'),
-(6, 'Analytic function'), (7, 'Loader function');
-ALTER TABLE sys.function_types SET READ ONLY;
-CREATE TABLE sys.function_languages (
-language_id SMALLINT NOT NULL PRIMARY KEY,
-language_name VARCHAR(20) NOT NULL UNIQUE);
-INSERT INTO sys.function_languages (language_id, language_name) VALUES
-(0, 'Internal C'), (1, 'MAL'), (2, 'SQL'), (3, 'R'), (6, 'Python'), (7,
'Python Mapped'), (8, 'Python2'), (9, 'Python2 Mapped'), (10, 'Python3'), (11,
'Python3 Mapped');
-ALTER TABLE sys.function_languages SET READ ONLY;
-CREATE TABLE sys.key_types (
-key_type_id SMALLINT NOT NULL PRIMARY KEY,
-key_type_name VARCHAR(15) NOT NULL UNIQUE);
-INSERT INTO sys.key_types (key_type_id, key_type_name) VALUES
-(0, 'Primary Key'), (1, 'Unique Key'), (2, 'Foreign Key');
-ALTER TABLE sys.key_types SET READ ONLY;
-CREATE TABLE sys.index_types (
-index_type_id SMALLINT NOT NULL PRIMARY KEY,
-index_type_name VARCHAR(25) NOT NULL UNIQUE);
-INSERT INTO sys.index_types (index_type_id, index_type_name) VALUES
-(0, 'Hash'), (1, 'Join'), (2, 'Order preserving hash'), (3, 'No-index'), (4,
'Imprint'), (5, 'Ordered');
-ALTER TABLE sys.index_types SET READ ONLY;
-CREATE TABLE sys.privilege_codes (
-privilege_code_id INT NOT NULL PRIMARY KEY,
-privilege_code_name VARCHAR(30) NOT NULL UNIQUE);
-INSERT INTO sys.privilege_codes (privilege_code_id, privilege_code_name) VALUES
-(1, 'SELECT'), (2, 'UPDATE'), (4, 'INSERT'), (8, 'DELETE'), (16, 'EXECUTE'),
(32, 'GRANT'),
-(3, 'SELECT,UPDATE'), (5, 'SELECT,INSERT'), (6, 'INSERT,UPDATE'), (7,
'SELECT,INSERT,UPDATE'),
-(9, 'SELECT,DELETE'), (10, 'UPDATE,DELETE'), (11, 'SELECT,UPDATE,DELETE'),
(12, 'INSERT,DELETE'),
-(13, 'SELECT,INSERT,DELETE'), (14, 'INSERT,UPDATE,DELETE'), (15,
'SELECT,INSERT,UPDATE,DELETE');
-ALTER TABLE sys.privilege_codes SET READ ONLY;
-update sys._tables set system = true where name in ('function_languages',
'function_types', 'index_types', 'key_types', 'privilege_codes') and schema_id
= (select id from sys.schemas where name = 'sys');
-delete from sys.systemfunctions where function_id not in (select id from
sys.functions);
-set schema "sys";
-
-# 15:41:19 >
-# 15:41:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-7576" "--port=32696"
-# 15:41:19 >
+# 13:36:30 >
+# 13:36:30 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-23413" "--port=30143"
+# 13:36:30 >
#select 1;
% .L2 # table_name
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -40,5165 +40,5212 @@ insert into sys.types values (8, 'bte',
insert into sys.types values (9, 'sht', 'smallint', 16, 1, 2, 7, 2000);
insert into sys.types values (10, 'int', 'int', 32, 1, 2, 7, 2000);
insert into sys.types values (11, 'lng', 'bigint', 64, 1, 2, 7, 2000);
-insert into sys.types values (12, 'lng', 'wrd', 64, 1, 2, 7, 2000);
-insert into sys.types values (13, 'hge', 'hugeint', 128, 1, 2, 7, 2000);
-insert into sys.types values (14, 'bte', 'decimal', 2, 1, 10, 10, 2000);
-insert into sys.types values (15, 'sht', 'decimal', 4, 1, 10, 10, 2000);
-insert into sys.types values (16, 'int', 'decimal', 9, 1, 10, 10, 2000);
-insert into sys.types values (17, 'lng', 'decimal', 18, 1, 10, 10, 2000);
-insert into sys.types values (18, 'hge', 'decimal', 38, 1, 10, 10, 2000);
-insert into sys.types values (19, 'flt', 'real', 24, 2, 2, 11, 2000);
-insert into sys.types values (20, 'dbl', 'double', 53, 2, 2, 11, 2000);
-insert into sys.types values (21, 'int', 'month_interval', 32, 0, 2, 8, 2000);
-insert into sys.types values (22, 'lng', 'sec_interval', 13, 1, 10, 9, 2000);
-insert into sys.types values (23, 'daytime', 'time', 7, 0, 0, 12, 2000);
-insert into sys.types values (24, 'daytime', 'timetz', 7, 1, 0, 12, 2000);
-insert into sys.types values (25, 'date', 'date', 0, 0, 0, 13, 2000);
-insert into sys.types values (26, 'timestamp', 'timestamp', 7, 0, 0, 14, 2000);
-insert into sys.types values (27, 'timestamp', 'timestamptz', 7, 1, 0, 14,
2000);
-insert into sys.types values (28, 'sqlblob', 'blob', 0, 0, 0, 5, 2000);
-insert into sys.types values (29, 'wkb', 'geometry', 0, 0, 0, 15, 2000);
-insert into sys.types values (30, 'wkba', 'geometrya', 0, 0, 0, 16, 2000);
-insert into sys.types values (31, 'mbr', 'mbr', 0, 0, 0, 16, 2000);
+insert into sys.types values (12, 'hge', 'hugeint', 128, 1, 2, 7, 2000);
+insert into sys.types values (13, 'bte', 'decimal', 2, 1, 10, 10, 2000);
+insert into sys.types values (14, 'sht', 'decimal', 4, 1, 10, 10, 2000);
+insert into sys.types values (15, 'int', 'decimal', 9, 1, 10, 10, 2000);
+insert into sys.types values (16, 'lng', 'decimal', 18, 1, 10, 10, 2000);
+insert into sys.types values (17, 'hge', 'decimal', 38, 1, 10, 10, 2000);
+insert into sys.types values (18, 'flt', 'real', 24, 2, 2, 11, 2000);
+insert into sys.types values (19, 'dbl', 'double', 53, 2, 2, 11, 2000);
+insert into sys.types values (20, 'int', 'month_interval', 32, 0, 2, 8, 2000);
+insert into sys.types values (21, 'lng', 'sec_interval', 13, 1, 10, 9, 2000);
+insert into sys.types values (22, 'daytime', 'time', 7, 0, 0, 12, 2000);
+insert into sys.types values (23, 'daytime', 'timetz', 7, 1, 0, 12, 2000);
+insert into sys.types values (24, 'date', 'date', 0, 0, 0, 13, 2000);
+insert into sys.types values (25, 'timestamp', 'timestamp', 7, 0, 0, 14, 2000);
+insert into sys.types values (26, 'timestamp', 'timestamptz', 7, 1, 0, 14,
2000);
+insert into sys.types values (27, 'sqlblob', 'blob', 0, 0, 0, 5, 2000);
+insert into sys.types values (28, 'wkb', 'geometry', 0, 0, 0, 15, 2000);
+insert into sys.types values (29, 'wkba', 'geometrya', 0, 0, 0, 16, 2000);
+insert into sys.types values (30, 'mbr', 'mbr', 0, 0, 0, 16, 2000);
delete from sys.functions where id < 2000;
delete from sys.args where func_id not in (select id from sys.functions);
+insert into sys.functions values (31, 'mbr_overlap', 'mbrOverlaps', 'geom', 0,
1, false, false, false, 2000);
+insert into sys.args values (11414, 31, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (11415, 31, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (11416, 31, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (32, 'mbr_overlap', 'mbrOverlaps', 'geom', 0,
1, false, false, false, 2000);
-insert into sys.args values (11356, 32, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (11357, 32, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (11358, 32, 'arg_2', 'geometry', 0, 0, 1, 2);
-insert into sys.functions values (33, 'mbr_overlap', 'mbrOverlaps', 'geom', 0,
1, false, false, false, 2000);
-insert into sys.args values (11359, 33, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (11360, 33, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (11361, 33, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (11417, 32, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (11418, 32, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (11419, 32, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.functions values (33, 'mbr_above', 'mbrAbove', 'geom', 0, 1,
false, false, false, 2000);
+insert into sys.args values (11420, 33, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (11421, 33, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (11422, 33, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (34, 'mbr_above', 'mbrAbove', 'geom', 0, 1,
false, false, false, 2000);
-insert into sys.args values (11362, 34, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (11363, 34, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (11364, 34, 'arg_2', 'geometry', 0, 0, 1, 2);
-insert into sys.functions values (35, 'mbr_above', 'mbrAbove', 'geom', 0, 1,
false, false, false, 2000);
-insert into sys.args values (11365, 35, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (11366, 35, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (11367, 35, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (11423, 34, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (11424, 34, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (11425, 34, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.functions values (35, 'mbr_below', 'mbrBelow', 'geom', 0, 1,
false, false, false, 2000);
+insert into sys.args values (11426, 35, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (11427, 35, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (11428, 35, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (36, 'mbr_below', 'mbrBelow', 'geom', 0, 1,
false, false, false, 2000);
-insert into sys.args values (11368, 36, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (11369, 36, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (11370, 36, 'arg_2', 'geometry', 0, 0, 1, 2);
-insert into sys.functions values (37, 'mbr_below', 'mbrBelow', 'geom', 0, 1,
false, false, false, 2000);
-insert into sys.args values (11371, 37, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (11372, 37, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (11373, 37, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (11429, 36, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (11430, 36, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (11431, 36, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.functions values (37, 'mbr_right', 'mbrRight', 'geom', 0, 1,
false, false, false, 2000);
+insert into sys.args values (11432, 37, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (11433, 37, 'arg_1', 'geometry', 0, 0, 1, 1);
+insert into sys.args values (11434, 37, 'arg_2', 'geometry', 0, 0, 1, 2);
insert into sys.functions values (38, 'mbr_right', 'mbrRight', 'geom', 0, 1,
false, false, false, 2000);
-insert into sys.args values (11374, 38, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (11375, 38, 'arg_1', 'geometry', 0, 0, 1, 1);
-insert into sys.args values (11376, 38, 'arg_2', 'geometry', 0, 0, 1, 2);
-insert into sys.functions values (39, 'mbr_right', 'mbrRight', 'geom', 0, 1,
false, false, false, 2000);
-insert into sys.args values (11377, 39, 'res_0', 'boolean', 1, 0, 0, 0);
-insert into sys.args values (11378, 39, 'arg_1', 'mbr', 0, 0, 1, 1);
-insert into sys.args values (11379, 39, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.args values (11435, 38, 'res_0', 'boolean', 1, 0, 0, 0);
+insert into sys.args values (11436, 38, 'arg_1', 'mbr', 0, 0, 1, 1);
+insert into sys.args values (11437, 38, 'arg_2', 'mbr', 0, 0, 1, 2);
+insert into sys.functions values (39, 'mbr_left', 'mbrLeft', 'geom', 0, 1,
false, false, false, 2000);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
