Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into  bodhi.local:/opt/local/work/mysql-5.0-14897


sql/mysqld.cc:
  Auto merged

1 files changed, 6 insertions, 0 deletions

diff --git a/include/mysql_com.h b/include/mysql_com.h
index 60e726396cb..e17a06a2f42 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -209,7 +209,13 @@ typedef struct st_net {
   char last_error[MYSQL_ERRMSG_SIZE], sqlstate[SQLSTATE_LENGTH+1];
   unsigned int last_errno;
   unsigned char error;
+
+  /*
+    'query_cache_query' should be accessed only via query cache
+    functions and methods to maintain proper locking.
+  */
   gptr query_cache_query;
+
   my_bool report_error; /* We should report error (we have unreported error) */
   my_bool return_errno;
 } NET;