Manual merge from master to develop. Incliding fix for bug #425 http://bugs.skysql.com/show_bug.cgi?id=425

2014-05-21 15:41:39 +03:00
parent c5ec3cbc57
commit c28052d5a4
7 changed files with 186 additions and 102 deletions
--- a/server/include/dcb.h
+++ b/server/include/dcb.h
@ -176,6 +176,7 @@ typedef struct dcb {
 	GWBUF		*writeq;	/**< Write Data Queue */
 	SPINLOCK	delayqlock;	/**< Delay Backend Write Queue spinlock */
 	GWBUF		*delayq;	/**< Delay Backend Write Data Queue */
+	GWBUF           *dcb_readqueue; /**< read queue for storing incomplete reads */
 	SPINLOCK	authlock;	/**< Generic Authorization spinlock */

 	DCBSTATS	stats;		/**< DCB related statistics */