merged

include/Makefile.am:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
client/Makefile.am:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/sql_lex.h:
  Auto merged

1 files changed, 6 insertions, 4 deletions

diff --git a/include/mysql_com.h b/include/mysql_com.h
index 6128a29ed5a..05a0e102bd1 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -113,10 +113,12 @@ typedef struct st_net {
   unsigned int last_errno,max_packet,timeout,pkt_nr;
   unsigned char error;
   my_bool return_errno,compress;
-  my_bool no_send_ok; /* needed if we are doing several
-   queries in one command ( as in LOAD TABLE ... FROM MASTER ),
-   and do not want to confuse the client with OK at the wrong time
-		      */
+  /*
+    The following variable is set if we are doing several queries in one
+    command ( as in LOAD TABLE ... FROM MASTER ),
+    and do not want to confuse the client with OK at the wrong time
+  */
+  my_bool no_send_ok;
   unsigned long remain_in_buf,length, buf_length, where_b;
   unsigned int *return_status;
   unsigned char reading_or_writing;