MonetDB: default - Merge with Oct2010 branch.

[Sjoerd Mullender]

Changeset: 814f39593a3c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=814f39593a3c
Modified Files:
        
Branch: default
Log Message:

Merge with Oct2010 branch.


diffs (23 lines):

diff -r d86ce85e9b5a -r 814f39593a3c clients/src/mapiclient/prompt.c
--- a/clients/src/mapiclient/prompt.c   Mon Sep 20 16:19:44 2010 +0200
+++ b/clients/src/mapiclient/prompt.c   Mon Sep 20 16:36:17 2010 +0200
@@ -93,6 +93,7 @@
                                destination[length++] = c;
                }
                destination[length] = 0;
+               _cputs("\r\n");
        }
        if (length == 0 && def)
                strcpy(destination, def);
diff -r d86ce85e9b5a -r 814f39593a3c sql/src/server/sql_scan.mx
--- a/sql/src/server/sql_scan.mx        Mon Sep 20 16:19:44 2010 +0200
+++ b/sql/src/server/sql_scan.mx        Mon Sep 20 16:36:17 2010 +0200
@@ -432,7 +432,7 @@
        s->rs->pos += s->yycur;
        /* completely eat the query including white space after the ; */
        while (s->rs->pos < s->rs->len &&
-              (cur = s->rs->buf[s->rs->pos], isspace(cur))) {
+              (cur = s->rs->buf[s->rs->pos], isascii(cur) && isspace(cur))) {
                s->rs->pos++;
        }
        /*assert(s->rs->pos <= s->rs->len);*/
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list