Merge branch 'develop' into MAX-324

Conflicts: server/include/modutil.h
2015-03-09 10:18:59 +02:00
parent 6766c0b883 f5d9c1e6df
commit 5471d35524
24 changed files with 1169 additions and 112 deletions
--- a/server/modules/routing/schemarouter/shardrouter.c
+++ b/server/modules/routing/schemarouter/shardrouter.c
@ -334,9 +334,10 @@ parse_mapping_response(ROUTER_CLIENT_SES* rses, char* target, GWBUF* buf)
 {
   bool rval = false;
   unsigned char* ptr;
+   int more = 0;

   if(PTR_IS_RESULTSET(((unsigned char*)buf->start)) &&
-      modutil_count_signal_packets(buf,0,0) == 2)
+      modutil_count_signal_packets(buf,0,0,&more) == 2)
   {
       ptr = (char*)buf->start;

@ -2988,4 +2989,4 @@ reply_error:
    }
 retblock:
    return succp;
-}
+}