MonetDB: Jan2014 - Merge with Feb2013 branch.

[Sjoerd Mullender]

Changeset: 1be23fa8fdea for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1be23fa8fdea
Modified Files:
        monetdb5/modules/atoms/mtime.c
        monetdb5/optimizer/opt_mitosis.c
        sql/backends/monet5/sql_scenario.c
        sql/server/rel_select.c
        sql/test/BugTracker-2013/Tests/All
Branch: Jan2014
Log Message:

Merge with Feb2013 branch.


diffs (14 lines):

diff --git a/sql/backends/monet5/sql_scenario.c 
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -1483,6 +1483,10 @@ SQLreader(Client c)
                                go = FALSE;
                                break;
                        } else if (go && !be->console && language == 0) {
+                               if (in->buf[in->pos] == 's' && !in->eof) {
+                                       while ((rd = bstream_next(in)) > 0)
+                                               ;
+                               }
                                be->language = in->buf[in->pos++];
                                if (be->language == 's') {
                                        be->language = 'S';
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list