Changeset: bdcb528a500b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bdcb528a500b Modified Files: Branch: default Log Message:
Merge with Jun2010 branch. diffs (48 lines): diff -r fdb07071159e -r bdcb528a500b MonetDB4/tests/from_Twente/moa/Tests/list.milS --- a/MonetDB4/tests/from_Twente/moa/Tests/list.milS Wed Jul 14 10:40:43 2010 +0200 +++ b/MonetDB4/tests/from_Twente/moa/Tests/list.milS Wed Jul 14 10:52:24 2010 +0200 @@ -954,7 +954,7 @@ _MMjoin_10 := join(indexA,_MMmirror_9); _MMreverse_11 := reverse(_MMmirror_9); _MMreverse_12 := reverse(valuesC); -_MMjoin_13 := join(valuesA,_MMreverse_12); +_MMjoin_13 := join(valuesA,_MMreverse_12).sort_ht(); _MMcastnil_14 := _MMjoin_13.mark(0...@0); _MMjoin_15 := join(_MMreverse_11,_MMcastnil_14); var _MMcastnil_16 := _MMjoin_15.mark(0...@0); diff -r fdb07071159e -r bdcb528a500b MonetDB4/tests/from_Twente/moa/Tests/list.stable.out --- a/MonetDB4/tests/from_Twente/moa/Tests/list.stable.out Wed Jul 14 10:40:43 2010 +0200 +++ b/MonetDB4/tests/from_Twente/moa/Tests/list.stable.out Wed Jul 14 10:52:24 2010 +0200 @@ -2182,7 +2182,7 @@ _MMjoin_10 := join(indexA,_MMmirror_9); _MMreverse_11 := reverse(_MMmirror_9); _MMreverse_12 := reverse(valuesC); -_MMjoin_13 := join(valuesA,_MMreverse_12); +_MMjoin_13 := join(valuesA,_MMreverse_12).sort_ht(); _MMcastnil_14 := _MMjoin_13.mark(0...@0); _MMjoin_15 := join(_MMreverse_11,_MMcastnil_14); var _MMcastnil_16 := _MMjoin_15.mark(0...@0); diff -r fdb07071159e -r bdcb528a500b MonetDB4/tests/from_Twente/moa/Tests/test.milS --- a/MonetDB4/tests/from_Twente/moa/Tests/test.milS Wed Jul 14 10:40:43 2010 +0200 +++ b/MonetDB4/tests/from_Twente/moa/Tests/test.milS Wed Jul 14 10:52:24 2010 +0200 @@ -968,7 +968,7 @@ var _MMreverse_11 := reverse(_MMjoin_10); var _MMnilcast_12 := _MMreverse_11.reverse().mark(0...@0).reverse(); var _MMjoin_13 := join(_MMnilcast_9,valuesD); -var _MMnilcast_14 := _MMjoin_7.reverse().mark(0...@0).reverse(); +var _MMnilcast_14 := _MMjoin_7s.reverse().mark(0...@0).reverse(); _MMnilcast_14.sort_ht().print(); var _MMjoin_15 := join(_MMnilcast_14,indexB); _MMjoin_15.sort_ht().print(); diff -r fdb07071159e -r bdcb528a500b MonetDB4/tests/from_Twente/moa/Tests/test.stable.out --- a/MonetDB4/tests/from_Twente/moa/Tests/test.stable.out Wed Jul 14 10:40:43 2010 +0200 +++ b/MonetDB4/tests/from_Twente/moa/Tests/test.stable.out Wed Jul 14 10:52:24 2010 +0200 @@ -2354,7 +2354,7 @@ var _MMreverse_11 := reverse(_MMjoin_10); var _MMnilcast_12 := _MMreverse_11.reverse().mark(0...@0).reverse(); var _MMjoin_13 := join(_MMnilcast_9,valuesD); -var _MMnilcast_14 := _MMjoin_7.reverse().mark(0...@0).reverse(); +var _MMnilcast_14 := _MMjoin_7s.reverse().mark(0...@0).reverse(); _MMnilcast_14.sort_ht().print(); #-----------------# # BAT: tmp_56 # _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
