Changeset: 038e52b15ecb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=038e52b15ecb
Modified Files:
clients/mapiclient/Tests/mclient--help.stable.err
gdk/gdk_logger.c
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
Branch: default
Log Message:
Merge with Oct2012 branch.
diffs (71 lines):
diff --git a/clients/mapiclient/Tests/mclient--help.stable.err
b/clients/mapiclient/Tests/mclient--help.stable.err
--- a/clients/mapiclient/Tests/mclient--help.stable.err
+++ b/clients/mapiclient/Tests/mclient--help.stable.err
@@ -16,7 +16,7 @@ Options are:
-h hostname | --host=hostname host or UNIX domain socket to connect to
-p portnr | --port=portnr port to connect to
-u user | --user=user user id
- -d database | --database=database database to connect to
+ -d database | --database=database database to connect to (may be URI)
-e | --echo echo the query
-E charset | --encoding=charset specify encoding (character set) of the
terminal
-f kind | --format=kind specify output format {csv,tab,raw,sql,xml}
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1120,14 +1120,18 @@ logger_new(int debug, char *fn, char *lo
b = BATdescriptor(bid);
lg->snapshots_bid = logbat_new(TYPE_void, TYPE_int, 1);
- BATappend(lg->snapshots_bid, BATmirror(b), FALSE);
+ v = BATmark(b, 0);
+ BATappend(lg->snapshots_bid, BATmirror(v), FALSE);
+ BBPunfix(v->batCacheid);
BATmode(lg->snapshots_bid, PERSISTENT);
snprintf(bak, BUFSIZ, "%s_snapshots_bid", fn);
BBPrename(lg->snapshots_bid->batCacheid, bak);
logger_add_bat(lg, lg->snapshots_bid, "snapshots_bid");
lg->snapshots_tid = logbat_new(TYPE_void, TYPE_int, 1);
- BATappend(lg->snapshots_tid, b, FALSE);
+ v = BATmark(BATmirror(b), 0);
+ BATappend(lg->snapshots_tid, BATmirror(v), FALSE);
+ BBPunfix(v->batCacheid);
BATmode(lg->snapshots_tid, PERSISTENT);
snprintf(bak, BUFSIZ, "%s_snapshots_tid", fn);
BBPrename(lg->snapshots_tid->batCacheid, bak);
@@ -1140,7 +1144,9 @@ logger_new(int debug, char *fn, char *lo
b = BATdescriptor(bid);
lg->seqs_id = logbat_new(TYPE_void, TYPE_int, 1);
- BATappend(lg->seqs_id, BATmirror(b), FALSE);
+ v = BATmark(b, 0);
+ BATappend(lg->seqs_id, BATmirror(v), FALSE);
+ BBPunfix(v->batCacheid);
BATmode(lg->seqs_id, PERSISTENT);
snprintf(bak, BUFSIZ, "%s_seqs_id", fn);
BBPrename(lg->seqs_id->batCacheid, bak);
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
@@ -19,6 +19,8 @@ stdout of test 'upgrade` in directory 't
# MonetDB/SQL module loaded
Ready.
+Running database upgrade commands:
+drop function sys.zorder_slice;
# 15:17:06 >
# 15:17:06 > "/usr/bin/python" "upgrade.SQL.py" "upgrade"
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
@@ -19,6 +19,8 @@ stdout of test 'upgrade` in directory 't
# MonetDB/SQL module loaded
Ready.
+Running database upgrade commands:
+drop function sys.zorder_slice;
# 14:40:54 >
# 14:40:54 > "/usr/bin/python" "upgrade.SQL.py" "upgrade"
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
