Handle server status in OK packet

yihuang · Nov 14, 2012 · 448413a · 448413a
1 parent 20c6721
commit 448413a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/Connection.cpp b/lib/Connection.cpp
@@ -605,6 +605,7 @@ void *Connection::handleOKPacket()
 
   m_reader.skip();
 
+  m_has_more_result = serverStatus & SERVER_MORE_RESULTS_EXISTS;
   return m_capi.resultOK(affectedRows, insertId, serverStatus, (char *) message, len);
 }
 
@@ -712,8 +713,8 @@ void *Connection::handleResultPacket(int _fieldCount)
       // ignore warning count.
       m_reader.readBytes(2); 
 
-      UINT16 server_status = m_reader.readShort();
-      m_has_more_result = server_status & SERVER_MORE_RESULTS_EXISTS;
+      UINT16 serverStatus = m_reader.readShort();
+      m_has_more_result = serverStatus & SERVER_MORE_RESULTS_EXISTS;
 
       m_reader.skip();
       break;

diff --git a/tests/tests.py b/tests/tests.py
@@ -776,6 +776,7 @@ def testMultiResult(self):
         self.assertEquals([(2,)], cnn.nextset().rows)
         self.assertEquals([(3,)], cnn.nextset().rows)
         self.assertEquals((0,0), cnn.nextset())
+        self.assertEquals(None, cnn.nextset())
 
 if __name__ == '__main__':
     from guppy import hpy