Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9736/src/backends/monet5
Modified Files:
sql_scenario.mx
Log Message:
propagated changes of Friday Oct 30 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/30 - stmane: src/backends/monet5/sql_scenario.mx,1.356.2.10
propagated changes of Friday Oct 30 2009
from the Aug2009 branch to the Nov2009 branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/30 - sjoerd: src/backends/monet5/sql_scenario.mx,1.352.2.6
Hardening: deal with failing realloc in buffer streams.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql_scenario.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_scenario.mx,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -d -r1.360 -r1.361
--- sql_scenario.mx 29 Oct 2009 08:42:59 -0000 1.360
+++ sql_scenario.mx 30 Oct 2009 21:42:15 -0000 1.361
@@ -794,7 +794,10 @@
}
in->eof = 0;
}
- if (go && (rd = bstream_next(in)) <= 0) {
+ if (in->buf == NULL) {
+ more = FALSE;
+ go = FALSE;
+ } else if (go && (rd = bstream_next(in)) <= 0) {
#ifdef _SQL_READER_DEBUG
stream_printf(GDKout, "#rd %d language %d eof %d\n",
rd, language, in->eof);
#endif
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
