MonetDB: Jun2016 - Merge with Jul2015 branch.

[Sjoerd Mullender]

Changeset: a6ebffd36621 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a6ebffd36621
Modified Files:
        gdk/gdk_logger.c
Branch: Jun2016
Log Message:

Merge with Jul2015 branch.


diffs (12 lines):

diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1510,7 +1510,7 @@ logger_load(int debug, const char* fn, c
                                list[3] = b2->batCacheid;
                                list[4] = n2->batCacheid;
                                logger_switch_bat(b, b2, fn, "catalog_bid");
-                               logger_switch_bat(n, n2, fn, "catalog_bid");
+                               logger_switch_bat(n, n2, fn, "catalog_nme");
                                bi = bat_iterator(b);
                                ni = bat_iterator(n);
                                BATloop(b, p, q) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list