Changeset: bf5b7356d1ed for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bf5b7356d1ed
Modified Files:
monetdb5/modules/kernel/bat5.mal
monetdb5/modules/mal/transaction.mal
sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
testing/Mfilter.py.in
Branch: Feb2013
Log Message:
Merged from Oct2012
diffs (80 lines):
diff --git a/monetdb5/modules/kernel/bat5.mal b/monetdb5/modules/kernel/bat5.mal
--- a/monetdb5/modules/kernel/bat5.mal
+++ b/monetdb5/modules/kernel/bat5.mal
@@ -228,7 +228,7 @@ comment "Delete one specific BUN.";
command delete(b:bat[:any_1, :any_2], h:any_1) :bat[:any_1,:any_2]
address BKCdelete
-comment "Delete all BUNs with a certain tail value.";
+comment "Delete all BUNs with a certain head value.";
command delete(b:bat[:any_1, :any_2]) :bat[:any_1,:any_2]
address BKCdelete_all
diff --git a/monetdb5/modules/mal/transaction.mal
b/monetdb5/modules/mal/transaction.mal
--- a/monetdb5/modules/mal/transaction.mal
+++ b/monetdb5/modules/mal/transaction.mal
@@ -43,7 +43,7 @@ comment "Declare a BAT clean without flu
command prev(b:bat[:oid,:any_1]):bat[:oid,:any_1]
address TRNtrans_prev
-comment "The previous stae of this BAT";
+comment "The previous state of this BAT";
command alpha(b:bat[:oid,:any_1]) :bat[:oid,:any_1]
address TRNtrans_alpha
comment "List insertions since last commit.";
diff --git
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
---
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
+++
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
@@ -68,9 +68,10 @@ stderr of test 'select_from_env.SF-12407
# 22:29:10 > mclient -lsql -i -umonetdb -Pmonetdb --host=pegasus --port=30332
# 22:29:10 >
-MAPI = monetdb@madrid:39416
+MAPI = (monetdb) /var/tmp/mtest-29744/.s.monetdb.36963
QUERY = select * from env() as env where name = ( select 'prefix' from env()
as env );
-ERROR = !cardinality violation (20>1)
+ERROR = !cardinality violation (21>1)
+
# 13:22:15 >
diff --git
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
---
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
+++
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
@@ -39,6 +39,7 @@ Ready.
[ "mapi_autosense" ]
[ "mapi_open" ]
[ "mapi_port" ]
+[ "mapi_usock" ]
[ "max_clients" ]
[ "monet_daemon" ]
[ "monet_mod_path" ]
diff --git
a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
--- a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
+++ b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
@@ -80,10 +80,10 @@ stderr of test 'cardinality_violation.SF
# 21:00:43 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=38808
# 21:00:43 >
-MAPI = monetdb@madrid:36834
+MAPI = (monetdb) /var/tmp/mtest-29744/.s.monetdb.36963
QUERY = select * from env() as env where name = ( select 'prefix' from env()
as env );
-ERROR = !cardinality violation (20>1)
-MAPI = monetdb@madrid:36834
+ERROR = !cardinality violation (21>1)
+MAPI = (monetdb) /var/tmp/mtest-29744/.s.monetdb.36963
QUERY = select * from columns where name = (select columns.name from _tables,
columns where _tables.id = columns.table_id);
ERROR = !cardinality violation (326>1)
diff --git a/testing/Mfilter.py.in b/testing/Mfilter.py.in
--- a/testing/Mfilter.py.in
+++ b/testing/Mfilter.py.in
@@ -48,7 +48,7 @@ test = (
# potential differences, which we want to ignore
re.compile('(?:'+')|(?:'.join([
# MAPI port numbers
- r"^MAPI = (.*@.*:\d*|\(monetdb\) /.*\.s\.monetdb\.\d+)$",
+ r"^MAPI =
(.*@.*:\d*|\((monetdb|testuser|(monet|user)_test|my_user2)\)
/.*\.s\.monetdb\.\d+)$",
# SPHINX is optional in monetdb5/modules/mal/inspec05
r'\[\s+"[^"]*",\s+"(?:command|function|pattern)",\s+"sphinx",\s+"[^"]*",\s+"[^"]*"\s+\]',
])+')', re.MULTILINE),
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
