MonetDB: default - Merge heads.

[Sjoerd Mullender]

Changeset: 1d6c6e18a4f0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1d6c6e18a4f0
Modified Files:
        
Branch: default
Log Message:

Merge heads.


diffs (16 lines):

diff -r 89e22aef2776 -r 1d6c6e18a4f0 sql/src/backends/monet5/sql_result.mx
--- a/sql/src/backends/monet5/sql_result.mx     Wed Dec 22 08:06:25 2010 +0100
+++ b/sql/src/backends/monet5/sql_result.mx     Wed Dec 22 08:07:08 2010 +0100
@@ -523,6 +523,12 @@
                                        BATmmap(b, STORE_MMAP, STORE_MMAP, 
STORE_MMAP, STORE_MMAP, 0);
                                fmt[i].c[0] = b;
                                cnt = BATcount(b);
+                               if ( BATcapacity(b) < (BUN) sz )
+                                       if ( (fmt[i].c[0] =  
BATextend(fmt[i].c[0], (BUN) sz)) == NULL){
+                                                       for ( i--; i>=0; i--)
+                                                               BBPunfix( 
fmt[i].c[0]->batCacheid);
+                                                       sql_error(m, 500, 
"failed to allocate result table sizes ");
+                               }
                                fmt[i].ci[0] = bat_iterator(fmt[i].c[0]);
                        }
                }
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list