Improved on pull request #55

Author: shyiko

src/main/java/com/github/shyiko/mysql/binlog/BinaryLogClient.java

@@ -670,11 +670,16 @@ private void updateGtidSet(Event event) {
 
     private ResultSetRowPacket[] readResultSet() throws IOException {
         List<ResultSetRowPacket> resultSet = new LinkedList<ResultSetRowPacket>();
-        if ((channel.read())[0] != (byte) 0xFF /* error */) {
-            while ((channel.read())[0] != (byte) 0xFE /* eof */) { /* skip */ }
-            for (byte[] bytes; (bytes = channel.read())[0] != (byte) 0xFE /* eof */; ) {
-                resultSet.add(new ResultSetRowPacket(bytes));
-            }
+        byte[] statementResult = channel.read();
+        if (statementResult[0] == (byte) 0xFF /* error */) {
+            byte[] bytes = Arrays.copyOfRange(statementResult, 1, statementResult.length);
+            ErrorPacket errorPacket = new ErrorPacket(bytes);
+            throw new ServerException(errorPacket.getErrorMessage(), errorPacket.getErrorCode(),
+                    errorPacket.getSqlState());
+        }
+        while ((channel.read())[0] != (byte) 0xFE /* eof */) { /* skip */ }
+        for (byte[] bytes; (bytes = channel.read())[0] != (byte) 0xFE /* eof */; ) {
+            resultSet.add(new ResultSetRowPacket(bytes));
         }
         return resultSet.toArray(new ResultSetRowPacket[resultSet.size()]);
     }

src/test/java/com/github/shyiko/mysql/binlog/BinaryLogClientIntegrationTest.java

@@ -31,6 +31,7 @@
 import com.github.shyiko.mysql.binlog.event.deserialization.QueryEventDataDeserializer;
 import com.github.shyiko.mysql.binlog.io.ByteArrayInputStream;
 import com.github.shyiko.mysql.binlog.network.AuthenticationException;
+import com.github.shyiko.mysql.binlog.network.ServerException;
 import org.mockito.InOrder;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterMethod;
@@ -603,21 +604,13 @@ public void testExceptionIsThrownWhenProvidedWithWrongCredentials() throws Excep
         }
     }
 
-    @Test
+    @Test(expectedExceptions = ServerException.class)
     public void testExceptionIsThrownWhenInsufficientPermissionsToDetectPosition() throws Exception {
         ResourceBundle bundle = ResourceBundle.getBundle("jdbc");
         String prefix = "jdbc.mysql.replication.";
         String slaveUsername = bundle.getString(prefix + "slave.slaveUsername");
         String slavePassword = bundle.getString(prefix + "slave.slavePassword");
-        BinaryLogClient binaryLogClient =
-            new BinaryLogClient(slave.hostname, slave.port, slaveUsername, slavePassword);
-
-        try {
-            binaryLogClient.connect();
-            fail("No REPLICATION CLIENT privilege should have resulted in IOException being thrown");
-        } catch (IOException e) {
-            assertFalse(binaryLogClient.isConnected());
-        }
+        new BinaryLogClient(slave.hostname, slave.port, slaveUsername, slavePassword).connect();
     }
 
     private void bindInSeparateThread(final TCPReverseProxy tcpReverseProxy) throws InterruptedException {