Changeset: c1c5e5c54e3c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c1c5e5c54e3c Modified Files: sql/test/mapi/Tests/php_monetdb.stable.out sql/test/mapi/Tests/php_monetdb_nogeom.stable.out Branch: default Log Message:
Merge with Feb2013 branch. diffs (50 lines): diff --git a/sql/test/mapi/Tests/php_monetdb.stable.out b/sql/test/mapi/Tests/php_monetdb.stable.out --- a/sql/test/mapi/Tests/php_monetdb.stable.out +++ b/sql/test/mapi/Tests/php_monetdb.stable.out @@ -101,13 +101,13 @@ 5357 tracelog 2000 create view sys.trace 5595 optimizers 2000 create view sys.optimizers as select * from sys.optimizers(); 1 true 0 false 0 5605 environment 2000 create view sys.environment as select * from sys.environment(); 1 true 0 false 0 5647 queue 2000 create view sys.queue as select * from sys.queue(); 1 true 0 false 0 -6103 storage 2000 create view sys.storage as select * from sys.storage(); 1 true 0 false 0 -6115 storagemodelinput 2000 0 true 0 false 0 -6158 storagemodel 2000 create view sys.storagemodel as select * from sys.storagemodel(); 1 true 0 false 0 -6167 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 columnsn-- would be augmented with a hash (rare situation)ncreate view sys.tablestoragemodelnas select "schema","table",max(count) as "count",ntsum(columnsize) as columnsize,ntsum(heapsize) as heapsize,ntsum(indices) as indices,ntsum(case when sorted = false then 8 * count else 0 end) as auxillarynfrom sys.storagemodel() group by "schema","table"; 1 true 0 false 0 -6189 systemfunctions 2000 0 true 0 false 0 +6128 storage 2000 create view sys.storage as select * from sys.storage(); 1 true 0 false 0 +6140 storagemodelinput 2000 0 true 0 false 0 +6183 storagemodel 2000 create view sys.storagemodel as select * from sys.storagemodel(); 1 true 0 false 0 +6192 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 columnsn-- would be augmented with a hash (rare situation)ncreate view sys.tablestoragemodelnas select "schema","table",max(count) as "count",ntsum(columnsize) as columnsize,ntsum(heapsize) as heapsize,ntsum(indices) as indices,ntsum(case when sorted = false then 8 * count else 0 end) as auxillarynfrom sys.storagemodel() group by "schema","table"; 1 true 0 false 0 +6214 systemfunctions 2000 0 true 0 false 0 -# 17:52:08 > -# 17:52:08 > "Done." -# 17:52:08 > +# 14:11:51 > +# 14:11:51 > "Done." +# 14:11:51 > diff --git a/sql/test/mapi/Tests/php_monetdb_nogeom.stable.out b/sql/test/mapi/Tests/php_monetdb_nogeom.stable.out --- a/sql/test/mapi/Tests/php_monetdb_nogeom.stable.out +++ b/sql/test/mapi/Tests/php_monetdb_nogeom.stable.out @@ -101,13 +101,13 @@ 5357 tracelog 2000 create view sys.trace 5595 optimizers 2000 create view sys.optimizers as select * from sys.optimizers(); 1 true 0 false 0 5605 environment 2000 create view sys.environment as select * from sys.environment(); 1 true 0 false 0 5647 queue 2000 create view sys.queue as select * from sys.queue(); 1 true 0 false 0 -5903 storage 2000 create view sys.storage as select * from sys.storage(); 1 true 0 false 0 -5915 storagemodelinput 2000 0 true 0 false 0 -5958 storagemodel 2000 create view sys.storagemodel as select * from sys.storagemodel(); 1 true 0 false 0 -5967 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 columnsn-- would be augmented with a hash (rare situation)ncreate view sys.tablestoragemodelnas select "schema","table",max(count) as "count",ntsum(columnsize) as columnsize,ntsum(heapsize) as heapsize,ntsum(indices) as indices,ntsum(case when sorted = false then 8 * count else 0 end) as auxillarynfrom sys.storagemodel() group by "schema","table"; 1 true 0 false 0 -5989 systemfunctions 2000 0 true 0 false 0 +5928 storage 2000 create view sys.storage as select * from sys.storage(); 1 true 0 false 0 +5940 storagemodelinput 2000 0 true 0 false 0 +5983 storagemodel 2000 create view sys.storagemodel as select * from sys.storagemodel(); 1 true 0 false 0 +5992 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 columnsn-- would be augmented with a hash (rare situation)ncreate view sys.tablestoragemodelnas select "schema","table",max(count) as "count",ntsum(columnsize) as columnsize,ntsum(heapsize) as heapsize,ntsum(indices) as indices,ntsum(case when sorted = false then 8 * count else 0 end) as auxillarynfrom sys.storagemodel() group by "schema","table"; 1 true 0 false 0 +6014 systemfunctions 2000 0 true 0 false 0 -# 17:52:08 > -# 17:52:08 > "Done." -# 17:52:08 > +# 14:15:39 > +# 14:15:39 > "Done." +# 14:15:39 > _______________________________________________ checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
