Merge lp:~linuxjedi/libdrizzle/5.1-bug-1094417 into lp:libdrizzle

[Andrew Hutchings]

MySQL 5.6 sends an error when an older binlog client connects. This wasn't handled (and neither was any other binlog error), it now is.

=== modified file 'libdrizzle/binlog.cc'
--- libdrizzle/binlog.cc	2012-12-22 08:54:15 +0000
+++ libdrizzle/binlog.cc	2012-12-29 09:00:30 +0000
@@ -231,6 +231,33 @@
     drizzle_state_pop(con);
     return DRIZZLE_RETURN_EOF;
   }
+  else if (con->buffer_ptr[0] == 255)
+  {
+    con->result->error_code= drizzle_get_byte2(con->buffer_ptr + 1);
+    con->error_code= con->result->error_code;
+    /* Byte 3 is always a '#' character, skip it. */
+    memcpy(con->result->sqlstate, con->buffer_ptr + 4,
+           DRIZZLE_MAX_SQLSTATE_SIZE);
+    con->result->sqlstate[DRIZZLE_MAX_SQLSTATE_SIZE]= 0;
+    memcpy(con->sqlstate, con->result->sqlstate,
+           DRIZZLE_MAX_SQLSTATE_SIZE + 1);
+    con->buffer_ptr+= 9;
+    con->buffer_size-= 9;
+    con->packet_size-= 9;
+
+    snprintf(con->last_error, DRIZZLE_MAX_ERROR_SIZE, "%.*s",
+             (int32_t)con->packet_size, con->buffer_ptr);
+    con->last_error[DRIZZLE_MAX_ERROR_SIZE-1]= 0;
+    snprintf(con->result->info, DRIZZLE_MAX_INFO_SIZE, "%.*s",
+             (int32_t)con->packet_size, con->buffer_ptr);
+    con->result->info[DRIZZLE_MAX_INFO_SIZE-1]= 0;
+    con->buffer_ptr+= con->packet_size;
+    con->buffer_size-= con->packet_size;
+    con->packet_size= 0;
+
+    drizzle_state_pop(con);
+    return DRIZZLE_RETURN_ERROR_CODE;
+  }
   else
   {
     con->buffer_ptr++;

=== modified file 'tests/unit/binlog.c'
--- tests/unit/binlog.c	2012-12-27 22:20:37 +0000
+++ tests/unit/binlog.c	2012-12-29 09:00:30 +0000
@@ -79,8 +79,15 @@
   {
     uint32_t timestamp;
     ret= drizzle_binlog_get_next_event(result);
-    if (ret != DRIZZLE_RETURN_OK)
+    if (ret == DRIZZLE_RETURN_EOF)
+    {
       break;
+    }
+    else if (ret != DRIZZLE_RETURN_OK)
+    {
+      printf("Binlog error %s\n", drizzle_error(con));
+      return EXIT_FAILURE;
+    }
     timestamp= drizzle_binlog_event_timestamp(result);
     /* Test to see if timestamp is greater than 2012-01-01 00:00:00, corrupted
      * timestamps will have weird values that shoud fail this after several