MonetDB: default - Merge with Jul2015 branch.

[Sjoerd Mullender]

Changeset: 73e7b9df073d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=73e7b9df073d
Modified Files:
        monetdb5/mal/mal_debugger.c
        monetdb5/modules/atoms/Makefile.ag
        sql/server/sql_mvc.c
        tools/merovingian/client/monetdb.c
Branch: default
Log Message:

Merge with Jul2015 branch.


diffs (57 lines):

diff --git a/monetdb5/modules/atoms/Makefile.ag 
b/monetdb5/modules/atoms/Makefile.ag
--- a/monetdb5/modules/atoms/Makefile.ag
+++ b/monetdb5/modules/atoms/Makefile.ag
@@ -20,13 +20,13 @@ lib_atoms = {
                color.c color.h \
                identifier.c \
                inet.c \
+               json.c json.h \
+               mcurl.c \
                mtime.c mtime.h \
+               str.c str.h \
                streams.c streams.h \
-               str.c str.h \
                url.c url.h \
-               json.c json.h \
                uuid.c \
-               mcurl.c \
                xml.c xml.h
 }
 
@@ -39,14 +39,14 @@ headers_mal = {
                color.mal \
                identifier.mal \
                inet.mal \
+               json.mal \
+               mcurl.mal \
+               mtime.mal \
                streams.mal \
                str.mal \
                url.mal \
-               json.mal \
                uuid.mal \
-               xml.mal \
-               mcurl.mal \
-               mtime.mal
+               xml.mal
 }
 
 headers_hge = {
@@ -58,4 +58,4 @@ headers_hge = {
 }
 
 EXTRA_DIST_DIR = Tests
-EXTRA_DIST = blob.mal color.mal identifier.mal inet.mal xml.mal xml.sql 
batxml.sql str.mal batxml.mal url.mal json.mal 00_json_hge.mal uuid.mal 
streams.mal mtime.mal mcurl.mal
+EXTRA_DIST = xml.sql batxml.sql
diff --git a/tools/merovingian/client/monetdb.c 
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -790,7 +790,7 @@ command_status(int argc, char *argv[])
                                dbwidth = t;
                        if (stats->uri != NULL && (t = strlen(stats->uri)) > 
uriwidth)
                                uriwidth = t;
-                       if (stats->locked && uriwidth < 32)
+                       if (uriwidth < 32)
                                uriwidth = 32;
                }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list