Changeset: 627465d57c3f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=627465d57c3f
Modified Files:
        NT/monetdb_config.h.in
        common/stream/stream.c
        common/utils/msabaoth.c
        monetdb5/modules/atoms/inet.c
        sql/jdbc/tests/Tests/BugExecuteUpdate_Bug_3350.stable.out
        sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows
        sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.out
        vertoo.config
Branch: default
Log Message:

Merge with Jul2017 branch.


diffs (261 lines):

diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -767,23 +767,23 @@
 /* Name of package */
 #define PACKAGE "MonetDB"
 
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "11.28.0"
+
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "i...@monetdb.org"
+#define PACKAGE_BUGREPORT "https://bugs.monetdb.org/";
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "MonetDB"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MonetDB 11.28.0"
+#define PACKAGE_STRING PACKAGE " " PACKAGE_VERSION
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "MonetDB"
 
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "11.28.0"
-
 /* Define to the home page for this package. */
-#define PACKAGE_URL ""
+#define PACKAGE_URL "https://www.monetdb.org/";
 
 /* Path separator */
 #define PATH_SEP ';'
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -4466,7 +4466,7 @@ bs2_stealbuf(stream *ss)
 
 int 
 bs2_resizebuf(stream *ss, size_t bufsiz) {
-       size_t compress_bound;
+       ssize_t compress_bound;
        bs2 *s = (bs2 *) ss->stream_data.p;
        assert(ss->read == bs2_read);
 
diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c
--- a/common/utils/msabaoth.c
+++ b/common/utils/msabaoth.c
@@ -1207,12 +1207,12 @@ msab_deserialise(sabdb **ret, char *sdb)
        /* fill/create sabdb struct */
 
        if (protover == '1') {
-               if ((dbname = strrchr(dbname, '/')) == NULL) {
+               if ((p = strrchr(dbname, '/')) == NULL) {
                        free(u);
                        snprintf(buf, sizeof(buf), "invalid path: %s", dbname);
                        return(strdup(buf));
                }
-               dbname++;
+               dbname = p + 1;
        }
 
        s = malloc(sizeof(sabdb));
diff --git a/monetdb5/modules/atoms/inet.c b/monetdb5/modules/atoms/inet.c
--- a/monetdb5/modules/atoms/inet.c
+++ b/monetdb5/modules/atoms/inet.c
@@ -229,9 +229,9 @@ INETtoString(str *retval, int *len, cons
 {
        const inet *value = (const inet *)handle;
 
-       if (*len < 19 || *retval == NULL) {
+       if (*len < 20 || *retval == NULL) {
                GDKfree(*retval);
-               *retval = GDKmalloc(sizeof(char) * (*len = 19));
+               *retval = GDKmalloc(sizeof(char) * (*len = 20));
                if( *retval == NULL)
                        return 0;
        }
@@ -699,11 +699,11 @@ INETtext(str *retval, const inet *val)
        if (in_isnil(val)) {
                *retval = GDKstrdup(str_nil);
        } else {
-               ip = GDKmalloc(sizeof(char) * 19);
+               ip = GDKmalloc(sizeof(char) * 20);
                if( ip == NULL)
                        throw(MAL,"INETtext",MAL_MALLOC_FAIL);
 
-               snprintf(ip, sizeof(char) * 19, "%d.%d.%d.%d/%d",
+               snprintf(ip, sizeof(char) * 20, "%d.%d.%d.%d/%d",
                                val->q1, val->q2, val->q3, val->q4, val->mask);
                *retval = ip;
        }
@@ -752,23 +752,24 @@ INETabbrev(str *retval, const inet *val)
                 * &:    00 00 00 00
                 * all zero, thus no bits on the right side of the mask
                 */
-               ip = GDKmalloc(sizeof(char) * 19);
+
+               ip = GDKmalloc(sizeof(char) * 20);
                if (ip == NULL)
                        throw(MAL, "inet.abbrev", MAL_MALLOC_FAIL);
 
                if (msk > 24) {
-                       snprintf(ip, sizeof(char) * 19, "%d.%d.%d.%d/%d",
+                       snprintf(ip, sizeof(char) * 20, "%d.%d.%d.%d/%d",
                                         val->q1, val->q2, val->q3, val->q4, 
val->mask);
                } else if (msk > 16) {
-                       snprintf(ip, sizeof(char) * 19, "%d.%d.%d/%d",
+                       snprintf(ip, sizeof(char) * 20, "%d.%d.%d/%d",
                                         val->q1, val->q2, val->q3, val->mask);
                } else if (msk > 8) {
-                       snprintf(ip, sizeof(char) * 19, "%d.%d/%d",
+                       snprintf(ip, sizeof(char) * 20, "%d.%d/%d",
                                         val->q1, val->q2, val->mask);
                } else if (msk > 0) {
-                       snprintf(ip, sizeof(char) * 19, "%d/%d", val->q1, 
val->mask);
+                       snprintf(ip, sizeof(char) * 20, "%d/%d", val->q1, 
val->mask);
                } else {
-                       snprintf(ip, sizeof(char) * 19, "/0");
+                       snprintf(ip, sizeof(char) * 20, "/0");
                }
 
                *retval = ip;
diff --git a/sql/jdbc/tests/Tests/BugExecuteUpdate_Bug_3350.stable.out 
b/sql/jdbc/tests/Tests/BugExecuteUpdate_Bug_3350.stable.out
--- a/sql/jdbc/tests/Tests/BugExecuteUpdate_Bug_3350.stable.out
+++ b/sql/jdbc/tests/Tests/BugExecuteUpdate_Bug_3350.stable.out
@@ -73,14 +73,20 @@ Ready.
 
 executeUpdate(INSERT ...) returned: 1
 getUpdateCount() returned: 1
-INSERT INTO: PRIMARY KEY constraint 'keywords.keywords_keyword_pkey' violated
+INSERT INTO: PRIMARY KEY constraint 't3350.t3350_keyword_pkey' violated
 getUpdateCount() returned: 1
 executeUpdate(INSERT ...) returned: 1
 getUpdateCount() returned: 1
+executeUpdate(INSERT ...) returned: 4
+getUpdateCount() returned: 4
 executeUpdate(DELETE ...) returned: 1
 getUpdateCount() returned: 1
 executeUpdate(DELETE ...) returned: 0
 getUpdateCount() returned: 0
+executeUpdate(UPDATE ...) returned: 4
+getUpdateCount() returned: 4
+executeUpdate(DELETE ...) returned: 4
+getUpdateCount() returned: 4
 
 # 19:27:23 >  
 # 19:27:23 >  "Done."
diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows 
b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows
--- a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows
+++ b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows
@@ -74,7 +74,7 @@ Ready.
 [ "sys",       "_tables",      "id",   "int",  "writable",     4,      0,      
false,  0       ]
 [ "sys",       "_tables",      "name", "varchar",      "writable",     9,      
0,      false,  0       ]
 [ "sys",       "_tables",      "schema_id",    "int",  "writable",     4,      
0,      false,  0       ]
-[ "sys",       "_tables",      "query",        "varchar",      "writable",     
55,     0,      false,  0       ]
+[ "sys",       "_tables",      "query",        "varchar",      "writable",     
51,     0,      false,  0       ]
 [ "sys",       "_tables",      "type", "smallint",     "writable",     2,      
0,      false,  0       ]
 [ "sys",       "_tables",      "system",       "boolean",      "writable",     
1,      0,      false,  0       ]
 [ "sys",       "_tables",      "commit_action",        "smallint",     
"writable",     2,      0,      false,  0       ]
@@ -99,7 +99,7 @@ Ready.
 [ "sys",       "_tables",      "id",   "int",  "writable",     4,      0,      
false,  0       ]
 [ "sys",       "_tables",      "name", "varchar",      "writable",     9,      
0,      false,  0       ]
 [ "sys",       "_tables",      "schema_id",    "int",  "writable",     4,      
0,      false,  0       ]
-[ "sys",       "_tables",      "query",        "varchar",      "writable",     
54,     0,      false,  0       ]
+[ "sys",       "_tables",      "query",        "varchar",      "writable",     
50,     0,      false,  0       ]
 [ "sys",       "_tables",      "type", "smallint",     "writable",     2,      
0,      false,  0       ]
 [ "sys",       "_tables",      "system",       "boolean",      "writable",     
1,      0,      false,  0       ]
 [ "sys",       "_tables",      "commit_action",        "smallint",     
"writable",     2,      0,      false,  0       ]
diff --git 
a/sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.out 
b/sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.out
--- a/sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.out
+++ b/sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.out
@@ -121,15 +121,15 @@ Ready.
 % name,        schema_id,      query,  type,   system, commit_action,  access, 
temporary # name
 % varchar,     int,    varchar,        smallint,       boolean,        
smallint,       smallint,       tinyint # type
 % 16,  4,      0,      2,      5,      1,      1,      1 # length
-[ "dependency_types",  2000,   NULL,   10,     true,   0,      0,      0       
]
-[ "table_types",       2000,   NULL,   10,     true,   0,      0,      0       
]
+[ "dependency_types",  2000,   NULL,   10,     true,   0,      1,      0       
]
+[ "table_types",       2000,   NULL,   10,     true,   0,      1,      0       
]
 #select * from system_tables ORDER BY name DESC, schema_id LIMIT 10;
 % sys.system_tables,   sys.system_tables,      sys.system_tables,      
sys.system_tables,      sys.system_tables,      sys.system_tables,      
sys.system_tables,      sys.system_tables # table_name
 % name,        schema_id,      query,  type,   system, commit_action,  access, 
temporary # name
 % varchar,     int,    varchar,        smallint,       boolean,        
smallint,       smallint,       tinyint # type
 % 16,  4,      0,      2,      5,      1,      1,      1 # length
-[ "table_types",       2000,   NULL,   10,     true,   0,      0,      0       
]
-[ "dependency_types",  2000,   NULL,   10,     true,   0,      0,      0       
]
+[ "table_types",       2000,   NULL,   10,     true,   0,      1,      0       
]
+[ "dependency_types",  2000,   NULL,   10,     true,   0,      1,      0       
]
 #select * from system_views;
 % sys.system_views,    sys.system_views,       sys.system_views,       
sys.system_views,       sys.system_views,       sys.system_views,       
sys.system_views,       sys.system_views # table_name
 % name,        schema_id,      query,  type,   system, commit_action,  access, 
temporary # name
@@ -149,9 +149,9 @@ Ready.
 % name,        schema_id,      query,  type,   system, commit_action,  access, 
temporary # name
 % varchar,     int,    varchar,        smallint,       boolean,        
smallint,       smallint,       tinyint # type
 % 16,  4,      0,      2,      5,      1,      1,      1 # length
-[ "dependency_types",  2000,   NULL,   10,     true,   0,      0,      0       
]
+[ "dependency_types",  2000,   NULL,   10,     true,   0,      1,      0       
]
 [ "my_tables", 2000,   NULL,   0,      false,  0,      0,      0       ]
-[ "table_types",       2000,   NULL,   10,     true,   0,      0,      0       
]
+[ "table_types",       2000,   NULL,   10,     true,   0,      1,      0       
]
 [ "test10",    2000,   NULL,   0,      false,  0,      0,      0       ]
 #select * from all_tables ORDER BY name DESC, schema_id LIMIT 10;
 % .all_tables, .all_tables,    .all_tables,    .all_tables,    .all_tables,    
.all_tables,    .all_tables,    .all_tables # table_name
@@ -159,9 +159,9 @@ Ready.
 % varchar,     int,    varchar,        smallint,       boolean,        
smallint,       smallint,       tinyint # type
 % 16,  4,      0,      2,      5,      1,      1,      1 # length
 [ "test10",    2000,   NULL,   0,      false,  0,      0,      0       ]
-[ "table_types",       2000,   NULL,   10,     true,   0,      0,      0       
]
+[ "table_types",       2000,   NULL,   10,     true,   0,      1,      0       
]
 [ "my_tables", 2000,   NULL,   0,      false,  0,      0,      0       ]
-[ "dependency_types",  2000,   NULL,   10,     true,   0,      0,      0       
]
+[ "dependency_types",  2000,   NULL,   10,     true,   0,      1,      0       
]
 #select * from all_views;
 % .all_views,  .all_views,     .all_views,     .all_views,     .all_views,     
.all_views,     .all_views,     .all_views # table_name
 % name,        schema_id,      query,  type,   system, commit_action,  access, 
temporary # name
@@ -198,13 +198,13 @@ Ready.
 [ "all_tables",        2000,   "create view all_tables as select * from 
user_tables union select * from system_tables order by schema_id, name;",      
1,      false,  0,      0,      0       ]
 [ "all_tbl_objs",      2000,   "create view all_tbl_objs as select * from 
all_tables union select * from all_views order by schema_id, name;", 1,      
false,  0,      0,      0       ]
 [ "all_views", 2000,   "create view all_views as select * from user_views 
union select * from system_views order by schema_id, name;", 1,      false,  0, 
     0,      0       ]
-[ "dependency_types",  2000,   NULL,   10,     true,   0,      0,      0       
]
+[ "dependency_types",  2000,   NULL,   10,     true,   0,      1,      0       
]
 [ "environment",       2000,   "create view sys.environment as select * from 
sys.environment();",      11,     true,   0,      0,      0       ]
 [ "my_tables", 2000,   NULL,   0,      false,  0,      0,      0       ]
 [ "optimizers",        2000,   "create view sys.optimizers as select * from 
sys.optimizers();",        11,     true,   0,      0,      0       ]
 [ "system_tables",     2000,   "create view system_tables as select * from 
my_tables where system and query is null and schema_id in (select id from 
sys.schemas where name = 'sys') order by schema_id, name;",       1,      
false,  0,      0,      0       ]
 [ "system_views",      2000,   "create view system_views as select * from 
my_tables where system and query is not null and schema_id in (select id from 
sys.schemas where name = 'sys') order by schema_id, name;",    1,      false,  
0,      0,      0       ]
-[ "table_types",       2000,   NULL,   10,     true,   0,      0,      0       
]
+[ "table_types",       2000,   NULL,   10,     true,   0,      1,      0       
]
 [ "test10",    2000,   NULL,   0,      false,  0,      0,      0       ]
 [ "user_tables",       2000,   "create view user_tables as select * from 
my_tables where not system and query is null order by schema_id, name;",      
1,      false,  0,      0,      0       ]
 [ "user_views",        2000,   "create view user_views as select * from 
my_tables where not system and query is not null order by schema_id, name;",   
1,      false,  0,      0,      0       ]
@@ -222,7 +222,7 @@ Ready.
 [ "all_views", 2000,   "create view all_views as select * from user_views 
union select * from system_views order by schema_id, name;", 1,      false,  0, 
     0,      0       ]
 [ "all_tbl_objs",      2000,   "create view all_tbl_objs as select * from 
all_tables union select * from all_views order by schema_id, name;", 1,      
false,  0,      0,      0       ]
 [ "all_tables",        2000,   "create view all_tables as select * from 
user_tables union select * from system_tables order by schema_id, name;",      
1,      false,  0,      0,      0       ]
-[ "dependency_types",  2000,   NULL,   10,     true,   0,      0,      0       
]
+[ "dependency_types",  2000,   NULL,   10,     true,   0,      1,      0       
]
 #select * from user_tables
 #UNION
 #select * from user_views
@@ -279,7 +279,7 @@ Ready.
 [ "system_views",      2000,   "create view system_views as select * from 
my_tables where system and query is not null and schema_id in (select id from 
sys.schemas where name = 'sys') order by schema_id, name;",    1,      false,  
0,      0,      0       ]
 [ "user_tables",       2000,   "create view user_tables as select * from 
my_tables where not system and query is null order by schema_id, name;",      
1,      false,  0,      0,      0       ]
 [ "user_views",        2000,   "create view user_views as select * from 
my_tables where not system and query is not null order by schema_id, name;",   
1,      false,  0,      0,      0       ]
-[ "table_types",       2000,   NULL,   10,     true,   0,      0,      0       
]
+[ "table_types",       2000,   NULL,   10,     true,   0,      1,      0       
]
 #(select * from user_tables UNION ALL select * from user_views)
 #INTERSECT
 #(select * from system_tables UNION select * from system_views)
diff --git a/vertoo.config b/vertoo.config
--- a/vertoo.config
+++ b/vertoo.config
@@ -13,7 +13,6 @@ main.addAnchor("MonetDB.spec", "%define 
 main.addAnchors("NT/rules.msc",
                 "VERSION=%v")
 main.addAnchors("NT/monetdb_config.h.in",
-                'PACKAGE_STRING "MonetDB %v"',
                 'PACKAGE_VERSION %Q')
 main.addAnchors("gdk/libbat.rc",
                 'VALUE "FileVersion", "%v\\0"',
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to