MonetDB: default - Merge with Jul2017 branch.

[Sjoerd Mullender]

Changeset: 80b41f158132 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=80b41f158132
Modified Files:
        sql/backends/monet5/rel_bin.c
Branch: default
Log Message:

Merge with Jul2017 branch.


diffs (36 lines):

diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -1059,12 +1059,12 @@ rel_parse_value(backend *be, char *query
        sr = buffer_rastream(b, "sqlstatement");
        if (sr == NULL) {
                buffer_destroy(b);
-               return sql_error(m, 02, "HY001" MAL_MALLOC_FAIL);
+               return sql_error(m, 02, SQLSTATE(HY001) MAL_MALLOC_FAIL);
        }
        bs = bstream_create(sr, b->len);
        if(bs == NULL) {
                buffer_destroy(b);
-               return sql_error(m, 02, "HY001" MAL_MALLOC_FAIL);
+               return sql_error(m, 02, SQLSTATE(HY001) MAL_MALLOC_FAIL);
        }
        scanner_init(&m->scanner, bs, NULL);
        m->scanner.mode = LINE_1; 
@@ -2870,7 +2870,7 @@ sql_parse(backend *be, sql_allocator *sa
        buf = buffer_rastream(b, "sqlstatement");
        if(buf == NULL) {
                buffer_destroy(b);
-               return sql_error(m, 02, "HY001" MAL_MALLOC_FAIL);
+               return sql_error(m, 02, SQLSTATE(HY001) MAL_MALLOC_FAIL);
        }
        scanner_init( &m->scanner, bstream_create(buf, b->len), NULL);
        m->scanner.mode = LINE_1; 
@@ -2888,7 +2888,7 @@ sql_parse(backend *be, sql_allocator *sa
                GDKfree(query);
                GDKfree(b);
                bstream_destroy(m->scanner.rs);
-               return sql_error(m, 02, "HY001" MAL_MALLOC_FAIL);
+               return sql_error(m, 02, SQLSTATE(HY001) MAL_MALLOC_FAIL);
        }
 
        if (sqlparse(m) || !m->sym) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list