Changeset: 01ef84ed226f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=01ef84ed226f Modified Files: 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 Branch: default Log Message:
limit_in_prepare.Bug-2552: approve default branch output diffs (96 lines): diff --git a/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out b/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out --- a/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out +++ b/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out @@ -77,21 +77,28 @@ Ready. [ 2130, "idxs", 2102, NULL, 0, true, 2, false, 0 ] [ 2135, "triggers", 2102, NULL, 0, true, 2, false, 0 ] [ 2146, "objects", 2102, NULL, 0, true, 2, false, 0 ] -[ 5075, "tables", 2000, "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;", 1, true, 0, false, 0 ] -[ 5085, "columns", 2000, "SELECT * FROM (SELECT p.* FROM \"sys\".\"_columns\" AS p UNION ALL SELECT t.* FROM \"tmp\".\"_columns\" AS t) AS columns;", 1, true, 0, false, 0 ] -[ 5105, "db_user_info", 2000, NULL, 0, true, 0, false, 0 ] -[ 5113, "users", 2000, "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\" ;", 1, true, 0, false, 0 ] -[ 5117, "user_role", 2000, NULL, 0, true, 0, false, 0 ] -[ 5120, "auths", 2000, NULL, 0, true, 0, false, 0 ] -[ 5124, "privileges", 2000, NULL, 0, true, 0, false, 0 ] -[ 5277, "queryhistory", 2000, NULL, 0, true, 0, false, 0 ] -[ 5291, "callhistory", 2000, NULL, 0, true, 0, false, 0 ] -[ 5308, "querylog", 2000, "create view querylog as\nselect qd.*, ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples, ql.inblock, ql.oublock from queryhistory qd, callhistory ql\nwhere qd.id = ql.id;", 1, true, 0, false, 0 ] -[ 6074, "storagemodelinput", 2000, NULL, 0, true, 0, false, 0 ] -[ 6115, "tablestoragemodel", 2000, "-- A summary of the table storage requirement is is available as a table view.\n-- The auxillary column denotes the maximum space if all non-sorted columns\n-- would be augmented with a hash (rare situation)\ncreate view sys.tablestoragemodel\nas select \"schema\",\"table\",max(count) as \"count\",\n\tsum(columnsize) as columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(indices) as indices,\n\tsum(case when sorted = false then 8 * count else 0 end) as auxillary\nfrom sys.storagemodel() group by \"schema\",\"table\";", 1, true, 0, false, 0 ] -[ 6137, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] +[ 5077, "tables", 2000, "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;", 1, true, 0, false, 0 ] +[ 5087, "columns", 2000, "SELECT * FROM (SELECT p.* FROM \"sys\".\"_columns\" AS p UNION ALL SELECT t.* FROM \"tmp\".\"_columns\" AS t) AS columns;", 1, true, 0, false, 0 ] +[ 5107, "db_user_info", 2000, NULL, 0, true, 0, false, 0 ] +[ 5115, "users", 2000, "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\" ;", 1, true, 0, false, 0 ] +[ 5119, "user_role", 2000, NULL, 0, true, 0, false, 0 ] +[ 5122, "auths", 2000, NULL, 0, true, 0, false, 0 ] +[ 5126, "privileges", 2000, NULL, 0, true, 0, false, 0 ] +[ 5303, "querylog_catalog", 2000, "-- create table views for convenience\ncreate view sys.querylog_catalog as select * from sys.querylog_catalog();", 1, true, 0, false, 0 ] +[ 5315, "querylog_calls", 2000, "create view sys.querylog_calls as select * from sys.querylog_calls();", 1, true, 0, false, 0 ] +[ 5333, "querylog_history", 2000, "create view sys.querylog_history as\nselect qd.*, ql.\"start\",ql.\"stop\", ql.arguments, ql.tuples, ql.run, ql.ship, ql.cpu, ql.space, ql.io \nfrom sys.querylog_catalog() qd, sys.querylog_calls() ql\nwhere qd.id = ql.id and qd.owner = user;", 1, true, 0, false, 0 ] +[ 5372, "tracelog", 2000, "create view sys.tracelog as select * from sys.tracelog();", 1, true, 0, false, 0 ] +[ 5620, "optimizers", 2000, "create view sys.optimizers as select * from sys.optimizers();", 1, true, 0, false, 0 ] +[ 5630, "environment", 2000, "create view sys.environment as select * from sys.environment();", 1, true, 0, false, 0 ] +[ 5672, "queue", 2000, "create view sys.queue as select * from sys.queue();", 1, true, 0, false, 0 ] +[ 6202, "storage", 2000, "create view sys.storage as select * from sys.storage();", 1, true, 0, false, 0 ] +[ 6214, "storagemodelinput", 2000, NULL, 0, true, 0, false, 0 ] +[ 6257, "storagemodel", 2000, "create view sys.storagemodel as select * from sys.storagemodel();", 1, true, 0, false, 0 ] +[ 6266, "tablestoragemodel", 2000, "-- A summary of the table storage requirement is is available as a table view.\n-- The auxillary column denotes the maximum space if all non-sorted columns\n-- would be augmented with a hash (rare situation)\ncreate view sys.tablestoragemodel\nas select \"schema\",\"table\",max(count) as \"count\",\n\tsum(columnsize) as columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(indices) as indices,\n\tsum(case when sorted = false then 8 * count else 0 end) as auxillary\nfrom sys.storagemodel() group by \"schema\",\"table\";", 1, true, 0, false, 0 ] +[ 6281, "statistics", 2000, NULL, 0, true, 0, false, 0 ] +[ 6335, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] -# 11:49:44 > -# 11:49:44 > "Done." -# 11:49:44 > +# 21:06:28 > +# 21:06:28 > "Done." +# 21:06:28 > diff --git a/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit b/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit --- a/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit +++ b/sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit @@ -77,21 +77,28 @@ Ready. [ 2130, "idxs", 2102, NULL, 0, true, 2, false, 0 ] [ 2135, "triggers", 2102, NULL, 0, true, 2, false, 0 ] [ 2146, "objects", 2102, NULL, 0, true, 2, false, 0 ] -[ 5075, "tables", 2000, "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;", 1, true, 0, false, 0 ] -[ 5085, "columns", 2000, "SELECT * FROM (SELECT p.* FROM \"sys\".\"_columns\" AS p UNION ALL SELECT t.* FROM \"tmp\".\"_columns\" AS t) AS columns;", 1, true, 0, false, 0 ] -[ 5105, "db_user_info", 2000, NULL, 0, true, 0, false, 0 ] -[ 5113, "users", 2000, "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\" ;", 1, true, 0, false, 0 ] -[ 5117, "user_role", 2000, NULL, 0, true, 0, false, 0 ] -[ 5120, "auths", 2000, NULL, 0, true, 0, false, 0 ] -[ 5124, "privileges", 2000, NULL, 0, true, 0, false, 0 ] -[ 5277, "queryhistory", 2000, NULL, 0, true, 0, false, 0 ] -[ 5291, "callhistory", 2000, NULL, 0, true, 0, false, 0 ] -[ 5308, "querylog", 2000, "create view querylog as\nselect qd.*, ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples, ql.inblock, ql.oublock from queryhistory qd, callhistory ql\nwhere qd.id = ql.id;", 1, true, 0, false, 0 ] -[ 6074, "storagemodelinput", 2000, NULL, 0, true, 0, false, 0 ] -[ 6115, "tablestoragemodel", 2000, "-- A summary of the table storage requirement is is available as a table view.\n-- The auxillary column denotes the maximum space if all non-sorted columns\n-- would be augmented with a hash (rare situation)\ncreate view sys.tablestoragemodel\nas select \"schema\",\"table\",max(count) as \"count\",\n\tsum(columnsize) as columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(indices) as indices,\n\tsum(case when sorted = false then 8 * count else 0 end) as auxillary\nfrom sys.storagemodel() group by \"schema\",\"table\";", 1, true, 0, false, 0 ] -[ 6137, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] +[ 5077, "tables", 2000, "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;", 1, true, 0, false, 0 ] +[ 5087, "columns", 2000, "SELECT * FROM (SELECT p.* FROM \"sys\".\"_columns\" AS p UNION ALL SELECT t.* FROM \"tmp\".\"_columns\" AS t) AS columns;", 1, true, 0, false, 0 ] +[ 5107, "db_user_info", 2000, NULL, 0, true, 0, false, 0 ] +[ 5115, "users", 2000, "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\" ;", 1, true, 0, false, 0 ] +[ 5119, "user_role", 2000, NULL, 0, true, 0, false, 0 ] +[ 5122, "auths", 2000, NULL, 0, true, 0, false, 0 ] +[ 5126, "privileges", 2000, NULL, 0, true, 0, false, 0 ] +[ 5303, "querylog_catalog", 2000, "-- create table views for convenience\ncreate view sys.querylog_catalog as select * from sys.querylog_catalog();", 1, true, 0, false, 0 ] +[ 5315, "querylog_calls", 2000, "create view sys.querylog_calls as select * from sys.querylog_calls();", 1, true, 0, false, 0 ] +[ 5333, "querylog_history", 2000, "create view sys.querylog_history as\nselect qd.*, ql.\"start\",ql.\"stop\", ql.arguments, ql.tuples, ql.run, ql.ship, ql.cpu, ql.space, ql.io \nfrom sys.querylog_catalog() qd, sys.querylog_calls() ql\nwhere qd.id = ql.id and qd.owner = user;", 1, true, 0, false, 0 ] +[ 5372, "tracelog", 2000, "create view sys.tracelog as select * from sys.tracelog();", 1, true, 0, false, 0 ] +[ 5620, "optimizers", 2000, "create view sys.optimizers as select * from sys.optimizers();", 1, true, 0, false, 0 ] +[ 5630, "environment", 2000, "create view sys.environment as select * from sys.environment();", 1, true, 0, false, 0 ] +[ 5672, "queue", 2000, "create view sys.queue as select * from sys.queue();", 1, true, 0, false, 0 ] +[ 6202, "storage", 2000, "create view sys.storage as select * from sys.storage();", 1, true, 0, false, 0 ] +[ 6214, "storagemodelinput", 2000, NULL, 0, true, 0, false, 0 ] +[ 6257, "storagemodel", 2000, "create view sys.storagemodel as select * from sys.storagemodel();", 1, true, 0, false, 0 ] +[ 6266, "tablestoragemodel", 2000, "-- A summary of the table storage requirement is is available as a table view.\n-- The auxillary column denotes the maximum space if all non-sorted columns\n-- would be augmented with a hash (rare situation)\ncreate view sys.tablestoragemodel\nas select \"schema\",\"table\",max(count) as \"count\",\n\tsum(columnsize) as columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(indices) as indices,\n\tsum(case when sorted = false then 8 * count else 0 end) as auxillary\nfrom sys.storagemodel() group by \"schema\",\"table\";", 1, true, 0, false, 0 ] +[ 6281, "statistics", 2000, NULL, 0, true, 0, false, 0 ] +[ 6335, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] -# 11:49:44 > -# 11:49:44 > "Done." -# 11:49:44 > +# 21:06:28 > +# 21:06:28 > "Done." +# 21:06:28 > _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
