bk commit into 6.0 tree (thek:1.2770)

[kpettersson]

Below is the list of changes that have just been committed into a local
6.0 repository of thek. When thek does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-01-03 14:15:17+01:00, thek@adventure.(none) +1 -0
  Fixed merge error.

  include/mysql_com.h@stripped, 2008-01-03 14:15:14+01:00, thek@adventure.(none) +1 -1
    Fixed merge error.

diff -Nrup a/include/mysql_com.h b/include/mysql_com.h
--- a/include/mysql_com.h	2008-01-02 17:18:56 +01:00
+++ b/include/mysql_com.h	2008-01-03 14:15:14 +01:00
@@ -229,7 +229,7 @@ typedef struct st_net {
   unsigned int client_last_errno;
   unsigned char error; 
   my_bool unused4; /* Please remove with the next incompatible ABI change. */
-  my_bool unused3; /* Please remove with the next incompatible ABI change. */
+  my_bool unused5; /* Please remove with the next incompatible ABI change. */
   /** Client library error message buffer. Actually belongs to struct MYSQL. */
   char client_last_error[MYSQL_ERRMSG_SIZE];
   /** Client library sqlstate buffer. Set along with the error message. */