Changeset: caa7a5f6a2a1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=caa7a5f6a2a1
Modified Files:
        sql/backends/monet5/sql.c
        sql/backends/monet5/sql_gencode.c
        sql/common/sql_types.c
Branch: default
Log Message:

cleanup old mx leftovers
initialize filename variable


diffs (60 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -2779,7 +2779,7 @@ mvc_import_table_wrap(Client cntxt, MalB
        BAT **b = NULL;
        unsigned char *tsep = NULL, *rsep = NULL, *ssep = NULL, *ns = NULL;
        ssize_t len = 0;
-       str filename, cs;
+       str filename = NULL, cs;
        sql_table *t = *(sql_table **) getArgReference(stk, pci, pci->retc + 0);
        unsigned char **T = (unsigned char **) getArgReference_str(stk, pci, 
pci->retc + 1);
        unsigned char **R = (unsigned char **) getArgReference_str(stk, pci, 
pci->retc + 2);
diff --git a/sql/backends/monet5/sql_gencode.c 
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -26,7 +26,6 @@
  * reduce the cost to prepare MAL statements significantly.
  *
  * A dummy module is needed to load properly.
- * @-
  */
 #include "monetdb_config.h"
 #include "sql_gencode.h"
@@ -58,7 +57,7 @@ static int backend_dumpstmt(backend *be,
  *
  * The catalog relations should be maintained in a MAL box, which
  * provides the handle for transaction management.
- * @-
+ *
  * The atoms produced by the parser should be converted back into
  * MAL constants. Ideally, this should not be necessary when the
  * SQL parser keeps the string representation around.
@@ -109,7 +108,6 @@ argumentZero(MalBlkPtr mb, int tpe)
 }
 
 /*
- * @-
  * To speedup code generation we freeze the references to the major modules.
  * This safes table lookups.
  */
@@ -128,7 +126,6 @@ initSQLreferences(void)
 }
 
 /*
- * @-
  * The dump_header produces a sequence of instructions for
  * the front-end to prepare presentation of a result table.
  */
diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c
--- a/sql/common/sql_types.c
+++ b/sql/common/sql_types.c
@@ -1618,7 +1618,7 @@ sqltypeinit( sql_allocator *sa)
                                sres, FALSE, F_FUNC, SCALE_FIX);
        }
        sres = create_arg(sa, NULL, sql_create_subtype(sa, TABLE, 0, 0), 
ARG_OUT); 
-       /* copyfrom fname (arg 6) */
+       /* copyfrom fname (arg 8) */
        f=sql_create_func_(sa, "copyfrom", "sql", "copy_from",
                list_append( list_append( list_append( list_append(list_append 
(list_append (list_append(list_append(sa_list(sa), 
                        create_arg(sa, NULL, sql_create_subtype(sa, STR, 0, 0), 
ARG_IN)), 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to