Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime

into  bodhi.(none):/opt/local/work/mysql-5.1-12713-1


mysql-test/r/grant.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged

2 files changed, 14 insertions, 15 deletions

diff --git a/include/mysql_com.h b/include/mysql_com.h
index 4ae7f66060f..b94a783e839 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -203,14 +203,10 @@ typedef struct st_net {
   unsigned int *return_status;
   unsigned char reading_or_writing;
   char save_char;
-  my_bool no_send_ok;  /* For SPs and other things that do multiple stmts */
+  my_bool unused0; /* Please remove with the next incompatible ABI change. */
   my_bool unused; /* Please remove with the next incompatible ABI change */
   my_bool compress;
-  /*
-    Set if OK packet is already sent, and we do not need to send error
-    messages
-  */
-  my_bool no_send_error;
+  my_bool unused1; /* Please remove with the next incompatible ABI change. */
   /*
     Pointer to query object in query cache, do not equal NULL (0) for
     queries in cache that have not stored its results yet
@@ -221,11 +217,14 @@ typedef struct st_net {
     functions and methods to maintain proper locking.
   */
   unsigned char *query_cache_query;
-  unsigned int last_errno;
-  unsigned char error;
-  my_bool report_error; /* We should report error (we have unreported error) */
+  unsigned int client_last_errno;
+  unsigned char error; 
+  my_bool unused2; /* Please remove with the next incompatible ABI change. */
   my_bool return_errno;
-  char last_error[MYSQL_ERRMSG_SIZE], sqlstate[SQLSTATE_LENGTH+1];
+  /** 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. */
+  char sqlstate[SQLSTATE_LENGTH+1];
   void *extension;
 } NET;
 
diff --git a/include/mysql_h.ic b/include/mysql_h.ic
index 4bedb9e8050..4f138d9a229 100644
--- a/include/mysql_h.ic
+++ b/include/mysql_h.ic
@@ -537,16 +537,16 @@ struct __attribute__((aligned(__alignof__(void *)), aligned(__alignof__(unsigned
     unsigned int * return_status;
     unsigned char reading_or_writing;
     char save_char;
-    my_bool no_send_ok;
+    my_bool unused0;
     my_bool unused;
     my_bool compress;
-    my_bool no_send_error;
+    my_bool unused1;
     unsigned char * query_cache_query;
-    unsigned int last_errno;
+    unsigned int client_last_errno;
     unsigned char error;
-    my_bool report_error;
+    my_bool unused2;
     my_bool return_errno;
-    char last_error[512];
+    char client_last_error[512];
     char sqlstate[(5 + 1)];
     void * extension;
   };