MonetDB: label - merged with default

[Niels Nes via checkin-list]

Changeset: 6e9997ee7216 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/6e9997ee7216
Branch: label
Log Message:

merged with default


diffs (18 lines):

diff --git a/sql/server/sql_scan.c b/sql/server/sql_scan.c
--- a/sql/server/sql_scan.c
+++ b/sql/server/sql_scan.c
@@ -1256,11 +1256,10 @@ int scanner_symbol(mvc * c, int cur)
                        lc->rs->buf[lc->rs->pos + lc->yycur - 2] = '<';
                        lc->rs->buf[lc->rs->pos + lc->yycur - 1] = '>';
                        return scanner_token( lc, COMPARISON);
+               } else {
+                       utf8_putchar(lc, cur); //put the char back
                }
-               else
-                       lc->yycur--;
-                       cur = '!';
-               break;
+               return scanner_token(lc, '!');
        case '<':
                lc->started = 1;
                cur = scanner_getc(lc);
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org