MonetDB: default - fixed compilation with icc

[Niels Nes]

Changeset: c02a1f833644 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c02a1f833644
Modified Files:
        sql/server/rel_dump.c
Branch: default
Log Message:

fixed compilation with icc


diffs (63 lines):

diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -913,7 +913,7 @@
        sql_rel *rel = NULL, *nrel, *lrel, *rrel;
        list *exps, *gexps;
        int distinct = 0;
-       operator_type j = 0;
+       operator_type j = op_basetable;
 
        skipWS(r,pos);
        if (r[*pos] == 'd') {
@@ -1086,25 +1086,25 @@
                j = op_left;
                /* fall through */
        case 'r': 
-               if (!j) {
+               if (j != op_basetable) {
                        *pos += strlen("right outer join");
                        j = op_right;
                }
                /* fall through */
        case 'f':
-               if (!j) {
+               if (j != op_basetable) {
                        *pos += strlen("full outer join");
                        j = op_full;
                }
                /* fall through */
        case 'c':
-               if (!j) {
+               if (j != op_basetable) {
                        *pos += strlen("crossproduct");
                        j = op_join;
                }
                /* fall through */
        case 'j':
-               if (!j) {
+               if (j != op_basetable) {
                        *pos += strlen("join");
                        j = op_join;
                }
@@ -1134,17 +1134,17 @@
                rel->exps = exps;
                return rel;
        case 'u':
-               if (!j) {
+               if (j != op_basetable) {
                        *pos += strlen("union");
                        j = op_union;
                }
        case 'i':
-               if (!j) {
+               if (j != op_basetable) {
                        *pos += strlen("intersect");
                        j = op_inter;
                }
        case 'e':
-               if (!j) {
+               if (j != op_basetable) {
                        *pos += strlen("except");
                        j = op_except;
                }
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list