Changeset: f35835c337d4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f35835c337d4
Modified Files:
MonetDB5/src/modules/mal/tablet_sql.mx
Branch: default
Log Message:
Merge from Jun2010 branch: If only one thread, don't reorder work.
This should make that the test sql/src/test/copy/Tests/overflow_error.sql
becomes stable.
diffs (12 lines):
diff -r b76d01a2549b -r f35835c337d4 MonetDB5/src/modules/mal/tablet_sql.mx
--- a/MonetDB5/src/modules/mal/tablet_sql.mx Mon Jul 05 10:45:11 2010 +0200
+++ b/MonetDB5/src/modules/mal/tablet_sql.mx Mon Jul 05 12:29:45 2010 +0200
@@ -377,7 +377,7 @@
if ( task->rounds > 8 )
return;
/* simple round robin the first time */
- if ( task->rounds++ == 0){
+ if ( threads == 1 || task->rounds++ == 0){
for ( i=j=0; i < nr_attrs; i++, j++)
ptask[ j % threads].cols[i] = task->cols[i];
return;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
