Update of /cvsroot/monetdb/MonetDB4/src/modules/plain
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30846/src/modules/plain
Modified Files:
bat_arith.mx
Log Message:
propagated changes of Monday Mar 17 2008 - Wednesday Mar 19 2008
from the MonetDB_4-22 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/03/17 - stmane:
src/modules/plain/Tests/aggr.stable.out,1.1.10.1(MonetDB_4-22,Stable_DailyBuild-19,Stable_DailyBuild-18)
src/modules/plain/Tests/aggr.stable.out.Windows,1.1.2.1(MonetDB_4-22,Stable_DailyBuild-19,Stable_DailyBuild-18)
src/modules/plain/Tests/aggr.stable.out.Windows.64bit,1.1.2.1(MonetDB_4-22,Stable_DailyBuild-19,Stable_DailyBuild-18)
src/modules/plain/Tests/aggrX3.stable.out,1.1.10.1(MonetDB_4-22,Stable_DailyBuild-19,Stable_DailyBuild-18)
src/modules/plain/Tests/aggrX3.stable.out.Windows,1.1.2.1(MonetDB_4-22,Stable_DailyBuild-19,Stable_DailyBuild-18)
src/modules/plain/Tests/aggrX3.stable.out.Windows.64bit,1.1.2.1(MonetDB_4-22,Stable_DailyBuild-19,Stable_DailyBuild-18)
propagated Niels' output approvals
from aggr{,X#}.stable.out.64bit to the general and the other system-specific
stable outputs:
"sum now returns NULL for empty bats"
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/03/19 - stmane: src/modules/plain/bat_arith.mx,1.4.2.4(MonetDB_4-22)
minor code alignment with MonetDB5/src/modules/kernel/batcalc.mx
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: bat_arith.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/modules/plain/bat_arith.mx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- bat_arith.mx 10 Feb 2008 23:47:55 -0000 1.6
+++ bat_arith.mx 19 Mar 2008 21:18:10 -0000 1.7
@@ -235,10 +235,10 @@
bn->tsorted = REVERT_SORTED(BATtordered(b));
} else
if (@6 & 32) {
- if (*v >= 0)
- bn->tsorted = BATtordered(b);
- else
+ if (*v < 0)
bn->tsorted = REVERT_SORTED(BATtordered(b));
+ else
+ bn->tsorted = BATtordered(b);
} else {
bn->tsorted = 0;
}
@@ -280,10 +280,10 @@
b->tsorted = REVERT_SORTED(BATtordered(b));
} else
if (@6 & 32) {
- if (*v >= 0)
- b->tsorted = BATtordered(b);
- else
+ if (*v < 0)
b->tsorted = REVERT_SORTED(BATtordered(b));
+ else
+ b->tsorted = BATtordered(b);
} else {
b->tsorted = 0;
}
@@ -338,10 +338,10 @@
bn->tsorted = REVERT_SORTED(BATtordered(b));
} else
if (@6 & 16) {
- if (*v >= 0)
- bn->tsorted = BATtordered(b);
- else
+ if (*v < 0)
bn->tsorted = REVERT_SORTED(BATtordered(b));
+ else
+ bn->tsorted = BATtordered(b);
} else {
bn->tsorted = 0;
}
@@ -384,10 +384,10 @@
b->tsorted = REVERT_SORTED(BATtordered(b));
} else
if (@6 & 16) {
- if (*v >= 0)
- b->tsorted = BATtordered(b);
- else
+ if (*v < 0)
b->tsorted = REVERT_SORTED(BATtordered(b));
+ else
+ b->tsorted = BATtordered(b);
} else {
b->tsorted = 0;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
