MonetDB: default - Merge with Dec2011 branch.

[Sjoerd Mullender]

Changeset: 7ad5ddffa078 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7ad5ddffa078
Modified Files:
        sql/storage/store.c
Branch: default
Log Message:

Merge with Dec2011 branch.


diffs (57 lines):

diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -1034,7 +1034,6 @@ static void
 insert_functions(sql_trans *tr, sql_table *sysfunc, sql_table *sysarg)
 {
        int zero = 0;
-       bit F = FALSE;
        node *n = NULL, *m = NULL;
 
        for (n = funcs->h; n; n = n->next) {
@@ -1046,9 +1045,9 @@ insert_functions(sql_trans *tr, sql_tabl
                char arg_nme[] = "arg_0";
 
                if (f->s)
-                       table_funcs.table_insert(tr, sysfunc, &f->base.id, 
f->base.name, f->imp, f->mod, &sql, &F, &se, &f->s->base.id);
+                       table_funcs.table_insert(tr, sysfunc, &f->base.id, 
f->base.name, f->imp, f->mod, &sql, &f->type, &se, &f->s->base.id);
                else
-                       table_funcs.table_insert(tr, sysfunc, &f->base.id, 
f->base.name, f->imp, f->mod, &sql, &F, &se, &zero);
+                       table_funcs.table_insert(tr, sysfunc, &f->base.id, 
f->base.name, f->imp, f->mod, &sql, &f->type, &se, &zero);
                
                if (f->res.type) {
                        char *name = "result";
@@ -1075,7 +1074,7 @@ static void
 insert_aggrs(sql_trans *tr, sql_table *sysfunc, sql_table *sysarg)
 {
        int zero = 0;
-       bit T = TRUE, F = FALSE;
+       bit F = FALSE;
        node *n = NULL;
 
        for (n = aggrs->h; n; n = n->next) {
@@ -1086,9 +1085,9 @@ insert_aggrs(sql_trans *tr, sql_table *s
                int number = 0;
 
                if (aggr->s)
-                       table_funcs.table_insert(tr, sysfunc, &aggr->base.id, 
aggr->base.name, aggr->imp, aggr->mod, &F, &T, &F, &aggr->s->base.id);
+                       table_funcs.table_insert(tr, sysfunc, &aggr->base.id, 
aggr->base.name, aggr->imp, aggr->mod, &F, &aggr->type, &F, &aggr->s->base.id);
                else
-                       table_funcs.table_insert(tr, sysfunc, &aggr->base.id, 
aggr->base.name, aggr->imp, aggr->mod, &F, &T, &F, &zero);
+                       table_funcs.table_insert(tr, sysfunc, &aggr->base.id, 
aggr->base.name, aggr->imp, aggr->mod, &F, &aggr->type, &F, &zero);
                
                id = next_oid();
                table_funcs.table_insert(tr, sysarg, &id, &aggr->base.id, 
name1, aggr->res.type->sqlname, &aggr->res.digits, &aggr->res.scale, &number);
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -105,9 +105,6 @@ usage(char *prog)
        fprintf(stderr,"     --optimizers\n");
        fprintf(stderr,"     --forcemito\n");
        fprintf(stderr,"     --debug=<bitmask>\n");
-#ifndef NATIVE_WIN32
-       fprintf(stderr,"(See `man mserver5.conf` for the documentation.)\n");
-#endif
 
        exit(0);
 }
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list