Changeset: dbec6606e6ec for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dbec6606e6ec
Modified Files:
MonetDB5/src/modules/mal/Tests/inspect05.stable.out.Debian
MonetDB5/src/modules/mal/Tests/inspect05.stable.out.Windows
MonetDB5/src/optimizer/opt_reorder.mx
Branch: default
Log Message:
merged output & compilation fixes from Jun2010
diffs (36 lines):
diff -r 61ad4c6b5d59 -r dbec6606e6ec
MonetDB5/src/modules/mal/Tests/inspect05.stable.out.Debian
--- a/MonetDB5/src/modules/mal/Tests/inspect05.stable.out.Debian Wed Jul
28 20:39:16 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/inspect05.stable.out.Debian Thu Jul
29 08:53:57 2010 +0200
@@ -1567,6 +1567,7 @@
[ "search", "command", "batstr",
"(s:bat[:oid,:str],c:bat[:oid,:str]):bat[:oid,:int] ",
"STRbatstrSearch;"
]
[ "startsWith", "command", "batstr",
"(s:bat[:oid,:str],prefix:str):bat[:oid,:bit] ",
"STRbatPrefixcst;"
]
[ "startsWith", "command", "batstr",
"(s:bat[:oid,:str],prefix:bat[:oid,:str]):bat[:oid,:bit] ",
"STRbatPrefix;"
]
+[ "stringlength", "command", "batstr",
"(s:bat[:oid,:str]):bat[:oid,:int] ",
"STRbatstringLength;"
]
[ "trim", "command", "batstr",
"(s:bat[:oid,:str]):bat[:oid,:str] ",
"STRbatStrip;"
]
[ "toUpper", "command", "batstr",
"(s:bat[:oid,:str]):bat[:oid,:str] ",
"STRbatUpper;"
]
[ "toLower", "command", "batstr",
"(s:bat[:oid,:str]):bat[:oid,:str] ",
"STRbatLower;"
]
diff -r 61ad4c6b5d59 -r dbec6606e6ec
MonetDB5/src/modules/mal/Tests/inspect05.stable.out.Windows
--- a/MonetDB5/src/modules/mal/Tests/inspect05.stable.out.Windows Wed Jul
28 20:39:16 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/inspect05.stable.out.Windows Thu Jul
29 08:53:57 2010 +0200
@@ -1567,6 +1567,7 @@
[ "search", "command", "batstr",
"(s:bat[:oid,:str],c:bat[:oid,:str]):bat[:oid,:int] ",
"STRbatstrSearch;"
]
[ "startsWith", "command", "batstr",
"(s:bat[:oid,:str],prefix:str):bat[:oid,:bit] ",
"STRbatPrefixcst;"
]
[ "startsWith", "command", "batstr",
"(s:bat[:oid,:str],prefix:bat[:oid,:str]):bat[:oid,:bit] ",
"STRbatPrefix;"
]
+[ "stringlength", "command", "batstr",
"(s:bat[:oid,:str]):bat[:oid,:int] ",
"STRbatstringLength;"
]
[ "trim", "command", "batstr",
"(s:bat[:oid,:str]):bat[:oid,:str] ",
"STRbatStrip;"
]
[ "toUpper", "command", "batstr",
"(s:bat[:oid,:str]):bat[:oid,:str] ",
"STRbatUpper;"
]
[ "toLower", "command", "batstr",
"(s:bat[:oid,:str]):bat[:oid,:str] ",
"STRbatLower;"
]
diff -r 61ad4c6b5d59 -r dbec6606e6ec MonetDB5/src/optimizer/opt_reorder.mx
--- a/MonetDB5/src/optimizer/opt_reorder.mx Wed Jul 28 20:39:16 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_reorder.mx Thu Jul 29 08:53:57 2010 +0200
@@ -103,8 +103,8 @@
}
for ( i=0; i< mb->stop; i++){
- size_t cnt;
- size_t slots;
+ int cnt;
+ int slots;
p= getInstrPtr(mb,i);
slots = 2 * p->argc;
block |= p->barrier != 0;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
