Changeset: 5a9ad9376ca5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5a9ad9376ca5
Modified Files:
        sql/test/emptydb/Tests/check.stable.out
        sql/test/emptydb/Tests/check.stable.out.32bit
        sql/test/emptydb/Tests/check.stable.out.int128
        sql/test/leaks/Tests/check0.stable.out.int128
        sql/test/leaks/Tests/check1.stable.out.int128
        sql/test/leaks/Tests/check2.stable.out.int128
        sql/test/leaks/Tests/check3.stable.out.int128
        sql/test/leaks/Tests/check4.stable.out.int128
        sql/test/leaks/Tests/check5.stable.out.int128
        sql/test/leaks/Tests/drop3.stable.out.int128
        sql/test/leaks/Tests/select1.stable.out.int128
        sql/test/leaks/Tests/select2.stable.out.int128
        sql/test/leaks/Tests/temp1.stable.out.int128
        sql/test/leaks/Tests/temp2.stable.out.int128
        sql/test/leaks/Tests/temp3.stable.out.int128
Branch: nostmt
Log Message:

approve output


diffs (truncated from 673 to 300 lines):

diff --git a/sql/test/emptydb/Tests/check.stable.out 
b/sql/test/emptydb/Tests/check.stable.out
--- a/sql/test/emptydb/Tests/check.stable.out
+++ b/sql/test/emptydb/Tests/check.stable.out
@@ -977,9 +977,9 @@ create function "right_shift"(i1 inet, i
 create function "right_shift_assign"(i1 inet, i2 inet) returns boolean 
external name inet.">>=";
 create function sys.sessions() returns table("user" string, "login" timestamp, 
"sessiontimeout" bigint, "lastcommand" timestamp, "querytimeout" bigint, 
"active" bool) external name sql.sessions;
 create function "setmasklen" (p inet, mask int) returns inet external name 
inet."setmasklen";
-create procedure sys.setsession("timeout" bigint) external name sql.setsession;
-create procedure sys.settimeout("query" bigint) external name sql.settimeout;
-create procedure sys.settimeout("query" bigint, "session" bigint) external 
name sql.settimeout;
+create procedure sys.setsession("timeout" bigint) external name 
clients.setsession;
+create procedure sys.settimeout("query" bigint) external name 
clients.settimeout;
+create procedure sys.settimeout("query" bigint, "session" bigint) external 
name clients.settimeout;
 create procedure shpattach(fname string) external name shp.attach;
 create procedure shpload(fid integer) external name shp.load;
 create procedure shpload(fid integer, filter geometry) external name 
shp.import;
@@ -1253,7 +1253,7 @@ drop function pcre_replace(string, strin
 [ "sys",       2,      3,      true    ]
 [ "tmp",       2,      3,      true    ]
 #select s.name, t.name, 
replace(replace(pcre_replace(pcre_replace(pcre_replace(t.query, '--.*\n', '', 
''), '[ \t\n]+', ' ', 'm'), '^ ', '', ''), '( ', '('), ' )', ')') as query, 
t.type, t.system, t.commit_action, t.access from sys._tables t left outer join 
sys.schemas s on t.schema_id = s.id order by s.name, t.name;
-% .s,  .t,     .L1,    .t,     .t,     .t,     .t # table_name
+% .s,  .t,     .L4,    .t,     .t,     .t,     .t # table_name
 % name,        name,   query,  type,   system, commit_action,  access # name
 % varchar,     varchar,        varchar,        smallint,       boolean,        
smallint,       smallint # type
 % 3,   17,     597,    1,      5,      1,      1 # length
@@ -1702,7 +1702,7 @@ drop function pcre_replace(string, strin
 [ "users",     "fullname",     "varchar",      2024,   0,      NULL,   true,   
1,      NULL    ]
 [ "users",     "default_schema",       "int",  9,      0,      NULL,   true,   
2,      NULL    ]
 #select s.name, f.name, 
replace(replace(pcre_replace(pcre_replace(pcre_replace(f.func, '--.*\n', '', 
''), '[ \t\n]+', ' ', 'm'), '^ ', '', ''), '( ', '('), ' )', ')') as query, 
f.mod, f.language, f.type, f.side_effect, f.varres, f.vararg from sys.functions 
f left outer join sys.schemas s on f.schema_id = s.id order by s.name, f.name, 
query;
-% .s,  .f,     .L1,    .f,     .f,     .f,     .f,     .f,     .f # table_name
+% .s,  .f,     .L4,    .f,     .f,     .f,     .f,     .f,     .f # table_name
 % name,        name,   query,  mod,    language,       type,   side_effect,    
varres, vararg # name
 % varchar,     varchar,        varchar,        varchar,        int,    int,    
boolean,        boolean,        boolean # type
 % 8,   35,     831,    9,      1,      1,      5,      5,      5 # length
@@ -1976,8 +1976,8 @@ drop function pcre_replace(string, strin
 [ "sys",       "hour", "hours",        "mtime",        0,      1,      false,  
false,  false   ]
 [ "sys",       "identity",     "identity",     "calc", 0,      1,      false,  
false,  false   ]
 [ "sys",       "ifthenelse",   "ifthenelse",   "calc", 0,      1,      false,  
false,  false   ]
-[ "sys",       "ilike",        "create filter function \"ilike\"(val string, 
pat string) external name algebra.\"ilike\";",    "algebra",      1,      4,    
  true,   false,  false   ]
-[ "sys",       "ilike",        "create filter function \"ilike\"(val string, 
pat string, esc string) external name algebra.\"ilike\";",        "algebra",    
  1,      4,      true,   false,  false   ]
+[ "sys",       "ilike",        "create filter function \"ilike\"(val string, 
pat string) external name algebra.\"ilike\";",    "algebra",      1,      4,    
  false,  false,  false   ]
+[ "sys",       "ilike",        "create filter function \"ilike\"(val string, 
pat string, esc string) external name algebra.\"ilike\";",        "algebra",    
  1,      4,      false,  false,  false   ]
 [ "sys",       "imprintsize",  "create function sys.imprintsize(i bigint, nme 
string) returns bigint begin if nme = 'boolean' or nme = 'tinyint' or nme = 
'smallint' or nme = 'int' or nme = 'bigint' or nme = 'hugeint' or nme = 
'decimal' or nme = 'date' or nme = 'timestamp' or nme = 'real' or nme = 
'double' then return cast(i * 0.12 as bigint); end if ; return 0; end;",     
"user", 2,      1,      false,  false,  false   ]
 [ "sys",       "in",   "in",   "calc", 0,      1,      false,  false,  false   
]
 [ "sys",       "index",        "index",        "calc", 0,      1,      false,  
false,  false   ]
@@ -2027,8 +2027,8 @@ drop function pcre_replace(string, strin
 [ "sys",       "lidarattach",  "create procedure lidarattach(fname string) 
external name lidar.attach;",       "lidar",        1,      2,      true,   
false,  false   ]
 [ "sys",       "lidarexport",  "create procedure lidarexport(tname string, 
fname string, format string) external name lidar.export;",  "lidar",        1,  
    2,      true,   false,  false   ]
 [ "sys",       "lidarload",    "create procedure lidarload(tname string) 
external name lidar.load;",   "lidar",        1,      2,      true,   false,  
false   ]
-[ "sys",       "like", "create filter function \"like\"(val string, pat 
string) external name algebra.\"like\";",      "algebra",      1,      4,      
true,   false,  false   ]
-[ "sys",       "like", "create filter function \"like\"(val string, pat 
string, esc string) external name algebra.\"like\";",  "algebra",      1,      
4,      true,   false,  false   ]
+[ "sys",       "like", "create filter function \"like\"(val string, pat 
string) external name algebra.\"like\";",      "algebra",      1,      4,      
false,  false,  false   ]
+[ "sys",       "like", "create filter function \"like\"(val string, pat 
string, esc string) external name algebra.\"like\";",  "algebra",      1,      
4,      false,  false,  false   ]
 [ "sys",       "listdir",      "create procedure listdir(dirname string) 
external name fits.listdir;", "fits", 1,      2,      true,   false,  false   ]
 [ "sys",       "listdirpat",   "create procedure listdirpat(dirname string,pat 
string) external name fits.listdirpattern;",    "fits", 1,      2,      true,   
false,  false   ]
 [ "sys",       "local_timezone",       "local_timezone",       "mtime",        
0,      1,      false,  false,  false   ]
@@ -2768,9 +2768,9 @@ drop function pcre_replace(string, strin
 [ "sys",       "second",       "sql_seconds",  "mtime",        0,      1,      
false,  false,  false   ]
 [ "sys",       "sessions",     "create function sys.sessions() returns 
table(\"user\" string, \"login\" timestamp, \"sessiontimeout\" bigint, 
\"lastcommand\" timestamp, \"querytimeout\" bigint, \"active\" bool) external 
name sql.sessions;",       "sql",  1,      5,      false,  false,  false   ]
 [ "sys",       "setmasklen",   "create function \"setmasklen\" (p inet, mask 
int) returns inet external name inet.\"setmasklen\";",    "inet", 1,      1,    
  false,  false,  false   ]
-[ "sys",       "setsession",   "create procedure sys.setsession(\"timeout\" 
bigint) external name sql.setsession;",    "sql",  1,      2,      true,   
false,  false   ]
-[ "sys",       "settimeout",   "create procedure sys.settimeout(\"query\" 
bigint) external name sql.settimeout;",      "sql",  1,      2,      true,   
false,  false   ]
-[ "sys",       "settimeout",   "create procedure sys.settimeout(\"query\" 
bigint, \"session\" bigint) external name sql.settimeout;",  "sql",  1,      2, 
     true,   false,  false   ]
+[ "sys",       "setsession",   "create procedure sys.setsession(\"timeout\" 
bigint) external name clients.setsession;",        "clients",      1,      2,   
   true,   false,  false   ]
+[ "sys",       "settimeout",   "create procedure sys.settimeout(\"query\" 
bigint) external name clients.settimeout;",  "clients",      1,      2,      
true,   false,  false   ]
+[ "sys",       "settimeout",   "create procedure sys.settimeout(\"query\" 
bigint, \"session\" bigint) external name clients.settimeout;",      "clients", 
     1,      2,      true,   false,  false   ]
 [ "sys",       "shpattach",    "create procedure shpattach(fname string) 
external name shp.attach;",   "shp",  1,      2,      true,   false,  false   ]
 [ "sys",       "shpload",      "create procedure shpload(fid integer) external 
name shp.load;",        "shp",  1,      2,      true,   false,  false   ]
 [ "sys",       "shpload",      "create procedure shpload(fid integer, filter 
geometry) external name shp.import;",     "shp",  1,      2,      true,   
false,  false   ]
@@ -5610,14 +5610,14 @@ drop function pcre_replace(string, strin
 % varchar,     varchar,        bigint, bigint, bigint, bigint, bigint, boolean 
# type
 % 0,   0,      1,      1,      1,      1,      1,      5 # length
 #select count(*) from sys.statistics;
-% sys.L2 # table_name
-% L1 # name
+% sys.L4 # table_name
+% L3 # name
 % bigint # type
 % 1 # length
 [ 0    ]
 #select count(*) from sys.storagemodelinput;
-% sys.L2 # table_name
-% L1 # name
+% sys.L4 # table_name
+% L3 # name
 % bigint # type
 % 1 # length
 [ 0    ]
diff --git a/sql/test/emptydb/Tests/check.stable.out.32bit 
b/sql/test/emptydb/Tests/check.stable.out.32bit
--- a/sql/test/emptydb/Tests/check.stable.out.32bit
+++ b/sql/test/emptydb/Tests/check.stable.out.32bit
@@ -981,9 +981,9 @@ create function "right_shift"(i1 inet, i
 create function "right_shift_assign"(i1 inet, i2 inet) returns boolean 
external name inet.">>=";
 create function sys.sessions() returns table("user" string, "login" timestamp, 
"sessiontimeout" bigint, "lastcommand" timestamp, "querytimeout" bigint, 
"active" bool) external name sql.sessions;
 create function "setmasklen" (p inet, mask int) returns inet external name 
inet."setmasklen";
-create procedure sys.setsession("timeout" bigint) external name sql.setsession;
-create procedure sys.settimeout("query" bigint) external name sql.settimeout;
-create procedure sys.settimeout("query" bigint, "session" bigint) external 
name sql.settimeout;
+create procedure sys.setsession("timeout" bigint) external name 
clients.setsession;
+create procedure sys.settimeout("query" bigint) external name 
clients.settimeout;
+create procedure sys.settimeout("query" bigint, "session" bigint) external 
name clients.settimeout;
 create procedure shpattach(fname string) external name shp.attach;
 create procedure shpload(fid integer) external name shp.load;
 create procedure shpload(fid integer, filter geometry) external name 
shp.import;
@@ -1257,7 +1257,7 @@ drop function pcre_replace(string, strin
 [ "sys",       2,      3,      true    ]
 [ "tmp",       2,      3,      true    ]
 #select s.name, t.name, 
replace(replace(pcre_replace(pcre_replace(pcre_replace(t.query, '--.*\n', '', 
''), '[ \t\n]+', ' ', 'm'), '^ ', '', ''), '( ', '('), ' )', ')') as query, 
t.type, t.system, t.commit_action, t.access from sys._tables t left outer join 
sys.schemas s on t.schema_id = s.id order by s.name, t.name;
-% .s,  .t,     .L1,    .t,     .t,     .t,     .t # table_name
+% .s,  .t,     .L4,    .t,     .t,     .t,     .t # table_name
 % name,        name,   query,  type,   system, commit_action,  access # name
 % varchar,     varchar,        varchar,        smallint,       boolean,        
smallint,       smallint # type
 % 3,   17,     597,    1,      5,      1,      1 # length
@@ -1706,7 +1706,7 @@ drop function pcre_replace(string, strin
 [ "users",     "fullname",     "varchar",      2024,   0,      NULL,   true,   
1,      NULL    ]
 [ "users",     "default_schema",       "int",  9,      0,      NULL,   true,   
2,      NULL    ]
 #select s.name, f.name, 
replace(replace(pcre_replace(pcre_replace(pcre_replace(f.func, '--.*\n', '', 
''), '[ \t\n]+', ' ', 'm'), '^ ', '', ''), '( ', '('), ' )', ')') as query, 
f.mod, f.language, f.type, f.side_effect, f.varres, f.vararg from sys.functions 
f left outer join sys.schemas s on f.schema_id = s.id order by s.name, f.name, 
query;
-% .s,  .f,     .L1,    .f,     .f,     .f,     .f,     .f,     .f # table_name
+% .s,  .f,     .L4,    .f,     .f,     .f,     .f,     .f,     .f # table_name
 % name,        name,   query,  mod,    language,       type,   side_effect,    
varres, vararg # name
 % varchar,     varchar,        varchar,        varchar,        int,    int,    
boolean,        boolean,        boolean # type
 % 8,   35,     831,    9,      1,      1,      5,      5,      5 # length
@@ -1980,8 +1980,8 @@ drop function pcre_replace(string, strin
 [ "sys",       "hour", "hours",        "mtime",        0,      1,      false,  
false,  false   ]
 [ "sys",       "identity",     "identity",     "calc", 0,      1,      false,  
false,  false   ]
 [ "sys",       "ifthenelse",   "ifthenelse",   "calc", 0,      1,      false,  
false,  false   ]
-[ "sys",       "ilike",        "create filter function \"ilike\"(val string, 
pat string) external name algebra.\"ilike\";",    "algebra",      1,      4,    
  true,   false,  false   ]
-[ "sys",       "ilike",        "create filter function \"ilike\"(val string, 
pat string, esc string) external name algebra.\"ilike\";",        "algebra",    
  1,      4,      true,   false,  false   ]
+[ "sys",       "ilike",        "create filter function \"ilike\"(val string, 
pat string) external name algebra.\"ilike\";",    "algebra",      1,      4,    
  false,  false,  false   ]
+[ "sys",       "ilike",        "create filter function \"ilike\"(val string, 
pat string, esc string) external name algebra.\"ilike\";",        "algebra",    
  1,      4,      false,  false,  false   ]
 [ "sys",       "imprintsize",  "create function sys.imprintsize(i bigint, nme 
string) returns bigint begin if nme = 'boolean' or nme = 'tinyint' or nme = 
'smallint' or nme = 'int' or nme = 'bigint' or nme = 'hugeint' or nme = 
'decimal' or nme = 'date' or nme = 'timestamp' or nme = 'real' or nme = 
'double' then return cast(i * 0.12 as bigint); end if ; return 0; end;",     
"user", 2,      1,      false,  false,  false   ]
 [ "sys",       "in",   "in",   "calc", 0,      1,      false,  false,  false   
]
 [ "sys",       "index",        "index",        "calc", 0,      1,      false,  
false,  false   ]
@@ -2031,8 +2031,8 @@ drop function pcre_replace(string, strin
 [ "sys",       "lidarattach",  "create procedure lidarattach(fname string) 
external name lidar.attach;",       "lidar",        1,      2,      true,   
false,  false   ]
 [ "sys",       "lidarexport",  "create procedure lidarexport(tname string, 
fname string, format string) external name lidar.export;",  "lidar",        1,  
    2,      true,   false,  false   ]
 [ "sys",       "lidarload",    "create procedure lidarload(tname string) 
external name lidar.load;",   "lidar",        1,      2,      true,   false,  
false   ]
-[ "sys",       "like", "create filter function \"like\"(val string, pat 
string) external name algebra.\"like\";",      "algebra",      1,      4,      
true,   false,  false   ]
-[ "sys",       "like", "create filter function \"like\"(val string, pat 
string, esc string) external name algebra.\"like\";",  "algebra",      1,      
4,      true,   false,  false   ]
+[ "sys",       "like", "create filter function \"like\"(val string, pat 
string) external name algebra.\"like\";",      "algebra",      1,      4,      
false,  false,  false   ]
+[ "sys",       "like", "create filter function \"like\"(val string, pat 
string, esc string) external name algebra.\"like\";",  "algebra",      1,      
4,      false,  false,  false   ]
 [ "sys",       "listdir",      "create procedure listdir(dirname string) 
external name fits.listdir;", "fits", 1,      2,      true,   false,  false   ]
 [ "sys",       "listdirpat",   "create procedure listdirpat(dirname string,pat 
string) external name fits.listdirpattern;",    "fits", 1,      2,      true,   
false,  false   ]
 [ "sys",       "local_timezone",       "local_timezone",       "mtime",        
0,      1,      false,  false,  false   ]
@@ -2772,9 +2772,9 @@ drop function pcre_replace(string, strin
 [ "sys",       "second",       "sql_seconds",  "mtime",        0,      1,      
false,  false,  false   ]
 [ "sys",       "sessions",     "create function sys.sessions() returns 
table(\"user\" string, \"login\" timestamp, \"sessiontimeout\" bigint, 
\"lastcommand\" timestamp, \"querytimeout\" bigint, \"active\" bool) external 
name sql.sessions;",       "sql",  1,      5,      false,  false,  false   ]
 [ "sys",       "setmasklen",   "create function \"setmasklen\" (p inet, mask 
int) returns inet external name inet.\"setmasklen\";",    "inet", 1,      1,    
  false,  false,  false   ]
-[ "sys",       "setsession",   "create procedure sys.setsession(\"timeout\" 
bigint) external name sql.setsession;",    "sql",  1,      2,      true,   
false,  false   ]
-[ "sys",       "settimeout",   "create procedure sys.settimeout(\"query\" 
bigint) external name sql.settimeout;",      "sql",  1,      2,      true,   
false,  false   ]
-[ "sys",       "settimeout",   "create procedure sys.settimeout(\"query\" 
bigint, \"session\" bigint) external name sql.settimeout;",  "sql",  1,      2, 
     true,   false,  false   ]
+[ "sys",       "setsession",   "create procedure sys.setsession(\"timeout\" 
bigint) external name clients.setsession;",        "clients",      1,      2,   
   true,   false,  false   ]
+[ "sys",       "settimeout",   "create procedure sys.settimeout(\"query\" 
bigint) external name clients.settimeout;",  "clients",      1,      2,      
true,   false,  false   ]
+[ "sys",       "settimeout",   "create procedure sys.settimeout(\"query\" 
bigint, \"session\" bigint) external name clients.settimeout;",      "clients", 
     1,      2,      true,   false,  false   ]
 [ "sys",       "shpattach",    "create procedure shpattach(fname string) 
external name shp.attach;",   "shp",  1,      2,      true,   false,  false   ]
 [ "sys",       "shpload",      "create procedure shpload(fid integer) external 
name shp.load;",        "shp",  1,      2,      true,   false,  false   ]
 [ "sys",       "shpload",      "create procedure shpload(fid integer, filter 
geometry) external name shp.import;",     "shp",  1,      2,      true,   
false,  false   ]
@@ -5614,14 +5614,14 @@ drop function pcre_replace(string, strin
 % varchar,     varchar,        bigint, bigint, bigint, bigint, bigint, boolean 
# type
 % 0,   0,      1,      1,      1,      1,      1,      5 # length
 #select count(*) from sys.statistics;
-% sys.L2 # table_name
-% L1 # name
+% sys.L4 # table_name
+% L3 # name
 % bigint # type
 % 1 # length
 [ 0    ]
 #select count(*) from sys.storagemodelinput;
-% sys.L2 # table_name
-% L1 # name
+% sys.L4 # table_name
+% L3 # name
 % bigint # type
 % 1 # length
 [ 0    ]
diff --git a/sql/test/emptydb/Tests/check.stable.out.int128 
b/sql/test/emptydb/Tests/check.stable.out.int128
--- a/sql/test/emptydb/Tests/check.stable.out.int128
+++ b/sql/test/emptydb/Tests/check.stable.out.int128
@@ -987,9 +987,9 @@ create function "right_shift"(i1 inet, i
 create function "right_shift_assign"(i1 inet, i2 inet) returns boolean 
external name inet.">>=";
 create function sys.sessions() returns table("user" string, "login" timestamp, 
"sessiontimeout" bigint, "lastcommand" timestamp, "querytimeout" bigint, 
"active" bool) external name sql.sessions;
 create function "setmasklen" (p inet, mask int) returns inet external name 
inet."setmasklen";
-create procedure sys.setsession("timeout" bigint) external name sql.setsession;
-create procedure sys.settimeout("query" bigint) external name sql.settimeout;
-create procedure sys.settimeout("query" bigint, "session" bigint) external 
name sql.settimeout;
+create procedure sys.setsession("timeout" bigint) external name 
clients.setsession;
+create procedure sys.settimeout("query" bigint) external name 
clients.settimeout;
+create procedure sys.settimeout("query" bigint, "session" bigint) external 
name clients.settimeout;
 create procedure shpattach(fname string) external name shp.attach;
 create procedure shpload(fid integer) external name shp.load;
 create procedure shpload(fid integer, filter geometry) external name 
shp.import;
@@ -1267,7 +1267,7 @@ drop function pcre_replace(string, strin
 [ "sys",       2,      3,      true    ]
 [ "tmp",       2,      3,      true    ]
 #select s.name, t.name, 
replace(replace(pcre_replace(pcre_replace(pcre_replace(t.query, '--.*\n', '', 
''), '[ \t\n]+', ' ', 'm'), '^ ', '', ''), '( ', '('), ' )', ')') as query, 
t.type, t.system, t.commit_action, t.access from sys._tables t left outer join 
sys.schemas s on t.schema_id = s.id order by s.name, t.name;
-% .s,  .t,     .L1,    .t,     .t,     .t,     .t # table_name
+% .s,  .t,     .L4,    .t,     .t,     .t,     .t # table_name
 % name,        name,   query,  type,   system, commit_action,  access # name
 % varchar,     varchar,        varchar,        smallint,       boolean,        
smallint,       smallint # type
 % 3,   17,     597,    1,      5,      1,      1 # length
@@ -1716,7 +1716,7 @@ drop function pcre_replace(string, strin
 [ "users",     "fullname",     "varchar",      2024,   0,      NULL,   true,   
1,      NULL    ]
 [ "users",     "default_schema",       "int",  9,      0,      NULL,   true,   
2,      NULL    ]
 #select s.name, f.name, 
replace(replace(pcre_replace(pcre_replace(pcre_replace(f.func, '--.*\n', '', 
''), '[ \t\n]+', ' ', 'm'), '^ ', '', ''), '( ', '('), ' )', ')') as query, 
f.mod, f.language, f.type, f.side_effect, f.varres, f.vararg from sys.functions 
f left outer join sys.schemas s on f.schema_id = s.id order by s.name, f.name, 
query;
-% .s,  .f,     .L1,    .f,     .f,     .f,     .f,     .f,     .f # table_name
+% .s,  .f,     .L4,    .f,     .f,     .f,     .f,     .f,     .f # table_name
 % name,        name,   query,  mod,    language,       type,   side_effect,    
varres, vararg # name
 % varchar,     varchar,        varchar,        varchar,        int,    int,    
boolean,        boolean,        boolean # type
 % 8,   35,     831,    9,      1,      1,      5,      5,      5 # length
@@ -2006,8 +2006,8 @@ drop function pcre_replace(string, strin
 [ "sys",       "hour", "hours",        "mtime",        0,      1,      false,  
false,  false   ]
 [ "sys",       "identity",     "identity",     "calc", 0,      1,      false,  
false,  false   ]
 [ "sys",       "ifthenelse",   "ifthenelse",   "calc", 0,      1,      false,  
false,  false   ]
-[ "sys",       "ilike",        "create filter function \"ilike\"(val string, 
pat string) external name algebra.\"ilike\";",    "algebra",      1,      4,    
  true,   false,  false   ]
-[ "sys",       "ilike",        "create filter function \"ilike\"(val string, 
pat string, esc string) external name algebra.\"ilike\";",        "algebra",    
  1,      4,      true,   false,  false   ]
+[ "sys",       "ilike",        "create filter function \"ilike\"(val string, 
pat string) external name algebra.\"ilike\";",    "algebra",      1,      4,    
  false,  false,  false   ]
+[ "sys",       "ilike",        "create filter function \"ilike\"(val string, 
pat string, esc string) external name algebra.\"ilike\";",        "algebra",    
  1,      4,      false,  false,  false   ]
 [ "sys",       "imprintsize",  "create function sys.imprintsize(i bigint, nme 
string) returns bigint begin if nme = 'boolean' or nme = 'tinyint' or nme = 
'smallint' or nme = 'int' or nme = 'bigint' or nme = 'hugeint' or nme = 
'decimal' or nme = 'date' or nme = 'timestamp' or nme = 'real' or nme = 
'double' then return cast(i * 0.12 as bigint); end if ; return 0; end;",     
"user", 2,      1,      false,  false,  false   ]
 [ "sys",       "in",   "in",   "calc", 0,      1,      false,  false,  false   
]
 [ "sys",       "index",        "index",        "calc", 0,      1,      false,  
false,  false   ]
@@ -2059,8 +2059,8 @@ drop function pcre_replace(string, strin
 [ "sys",       "lidarattach",  "create procedure lidarattach(fname string) 
external name lidar.attach;",       "lidar",        1,      2,      true,   
false,  false   ]
 [ "sys",       "lidarexport",  "create procedure lidarexport(tname string, 
fname string, format string) external name lidar.export;",  "lidar",        1,  
    2,      true,   false,  false   ]
 [ "sys",       "lidarload",    "create procedure lidarload(tname string) 
external name lidar.load;",   "lidar",        1,      2,      true,   false,  
false   ]
-[ "sys",       "like", "create filter function \"like\"(val string, pat 
string) external name algebra.\"like\";",      "algebra",      1,      4,      
true,   false,  false   ]
-[ "sys",       "like", "create filter function \"like\"(val string, pat 
string, esc string) external name algebra.\"like\";",  "algebra",      1,      
4,      true,   false,  false   ]
+[ "sys",       "like", "create filter function \"like\"(val string, pat 
string) external name algebra.\"like\";",      "algebra",      1,      4,      
false,  false,  false   ]
+[ "sys",       "like", "create filter function \"like\"(val string, pat 
string, esc string) external name algebra.\"like\";",  "algebra",      1,      
4,      false,  false,  false   ]
 [ "sys",       "listdir",      "create procedure listdir(dirname string) 
external name fits.listdir;", "fits", 1,      2,      true,   false,  false   ]
 [ "sys",       "listdirpat",   "create procedure listdirpat(dirname string,pat 
string) external name fits.listdirpattern;",    "fits", 1,      2,      true,   
false,  false   ]
 [ "sys",       "local_timezone",       "local_timezone",       "mtime",        
0,      1,      false,  false,  false   ]
@@ -2905,9 +2905,9 @@ drop function pcre_replace(string, strin
 [ "sys",       "second",       "sql_seconds",  "mtime",        0,      1,      
false,  false,  false   ]
 [ "sys",       "sessions",     "create function sys.sessions() returns 
table(\"user\" string, \"login\" timestamp, \"sessiontimeout\" bigint, 
\"lastcommand\" timestamp, \"querytimeout\" bigint, \"active\" bool) external 
name sql.sessions;",       "sql",  1,      5,      false,  false,  false   ]
 [ "sys",       "setmasklen",   "create function \"setmasklen\" (p inet, mask 
int) returns inet external name inet.\"setmasklen\";",    "inet", 1,      1,    
  false,  false,  false   ]
-[ "sys",       "setsession",   "create procedure sys.setsession(\"timeout\" 
bigint) external name sql.setsession;",    "sql",  1,      2,      true,   
false,  false   ]
-[ "sys",       "settimeout",   "create procedure sys.settimeout(\"query\" 
bigint) external name sql.settimeout;",      "sql",  1,      2,      true,   
false,  false   ]
-[ "sys",       "settimeout",   "create procedure sys.settimeout(\"query\" 
bigint, \"session\" bigint) external name sql.settimeout;",  "sql",  1,      2, 
     true,   false,  false   ]
+[ "sys",       "setsession",   "create procedure sys.setsession(\"timeout\" 
bigint) external name clients.setsession;",        "clients",      1,      2,   
   true,   false,  false   ]
+[ "sys",       "settimeout",   "create procedure sys.settimeout(\"query\" 
bigint) external name clients.settimeout;",  "clients",      1,      2,      
true,   false,  false   ]
+[ "sys",       "settimeout",   "create procedure sys.settimeout(\"query\" 
bigint, \"session\" bigint) external name clients.settimeout;",      "clients", 
     1,      2,      true,   false,  false   ]
 [ "sys",       "shpattach",    "create procedure shpattach(fname string) 
external name shp.attach;",   "shp",  1,      2,      true,   false,  false   ]
 [ "sys",       "shpload",      "create procedure shpload(fid integer) external 
name shp.load;",        "shp",  1,      2,      true,   false,  false   ]
 [ "sys",       "shpload",      "create procedure shpload(fid integer, filter 
geometry) external name shp.import;",     "shp",  1,      2,      true,   
false,  false   ]
@@ -5177,9 +5177,9 @@ drop function pcre_replace(string, strin
 [ "public",    0       ]
 [ "sysadmin",  0       ]
 [ "monetdb",   0       ]
-#select server, port, db, db_alias, user, password, language from connections 
order by server, port;
-% sys.connections,     sys.connections,        sys.connections,        
sys.connections,        .L1,    sys.connections,        sys.connections # 
table_name
-% server,      port,   db,     db_alias,       L1,     password,       
language # name
+#select server, port, db, db_alias, user, password, language from 
sys.connections order by server, port;
+% sys.connections,     sys.connections,        sys.connections,        
sys.connections,        .L6,    sys.connections,        sys.connections # 
table_name
+% server,      port,   db,     db_alias,       L6,     password,       
language # name
 % char,        int,    char,   char,   varchar,        char,   char # type
 % 1024,        1,      64,     1024,   0,      1024,   1024 # length
 #select u.name, u.fullname, s.name from db_user_info u left outer join schemas 
s on u.default_schema = s.id order by u.name;
@@ -5995,14 +5995,14 @@ drop function pcre_replace(string, strin
 % varchar,     varchar,        bigint, bigint, bigint, bigint, bigint, boolean 
# type
 % 0,   0,      1,      1,      1,      1,      1,      5 # length
 #select count(*) from sys.statistics;
-% sys.L2 # table_name
-% L1 # name
+% sys.L4 # table_name
+% L3 # name
 % bigint # type
 % 1 # length
 [ 0    ]
 #select count(*) from sys.storagemodelinput;
-% sys.L2 # table_name
-% L1 # name
+% sys.L4 # table_name
+% L3 # name
 % bigint # type
 % 1 # length
 [ 0    ]
diff --git a/sql/test/leaks/Tests/check0.stable.out.int128 
b/sql/test/leaks/Tests/check0.stable.out.int128
--- a/sql/test/leaks/Tests/check0.stable.out.int128
+++ b/sql/test/leaks/Tests/check0.stable.out.int128
@@ -76,14 +76,14 @@ Ready.
 [ "str",       1       ]
 [ "str",       256     ]
 #select 'transient', count(*) from bbp() as bbp where kind like 'tran%';
-% .L1, .L3 # table_name
-% L1,  L2 # name
+% .L2, .L6 # table_name
+% L2,  L5 # name
 % char,        bigint # type
 % 9,   3 # length
 [ "transient", 552     ]
 #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
-% .L1, .L3 # table_name
-% L1,  L2 # name
+% .L2, .L6 # table_name
+% L2,  L5 # name
 % char,        bigint # type
 % 10,  2 # length
 [ "persistent",        13      ]
diff --git a/sql/test/leaks/Tests/check1.stable.out.int128 
b/sql/test/leaks/Tests/check1.stable.out.int128
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to