Merge 4.1 to 5.0

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/protocol_cursor.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_error.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1 files changed, 14 insertions, 6 deletions

diff --git a/sql/protocol.cc b/sql/protocol.cc
index c28c1e1abb8..89aa7203e17 100644
--- a/sql/protocol.cc
+++ b/sql/protocol.cc
@@ -298,6 +298,12 @@ send_ok(THD *thd, ha_rows affected_rows, ulonglong id, const char *message)
   pos=net_store_length(pos, (ulonglong) id);
   if (thd->client_capabilities & CLIENT_PROTOCOL_41)
   {
+    DBUG_PRINT("info",
+	       ("affected_rows: %lu  id: %lu  status: %u  warning_count: %u",
+		(ulong) affected_rows,		
+		(ulong) id,
+		(uint) (thd->server_status & 0xffff),
+		(uint) thd->total_warn_count));
     int2store(pos,thd->server_status);
     pos+=2;
 
@@ -315,6 +321,8 @@ send_ok(THD *thd, ha_rows affected_rows, ulonglong id, const char *message)
     pos=net_store_data((char*) pos, message, strlen(message));
   VOID(my_net_write(net,buff,(uint) (pos-buff)));
   VOID(net_flush(net));
+  /* We can't anymore send an error to the client */
+  thd->net.report_error= 0;
   DBUG_VOID_RETURN;
 }
 
@@ -494,7 +502,7 @@ bool Protocol::send_fields(List<Item> *list, uint flag)
   char buff[80];
   String tmp((char*) buff,sizeof(buff),&my_charset_bin);
   Protocol_simple prot(thd);
-  String *packet= prot.storage_packet();
+  String *local_packet= prot.storage_packet();
   CHARSET_INFO *thd_charset= thd->variables.character_set_results;
   DBUG_ENTER("send_fields");
 
@@ -531,10 +539,10 @@ bool Protocol::send_fields(List<Item> *list, uint flag)
 		     cs, thd_charset) ||
 	  prot.store(field.org_col_name, (uint) strlen(field.org_col_name),
 		     cs, thd_charset) ||
-	  packet->realloc(packet->length()+12))
+	  local_packet->realloc(local_packet->length()+12))
 	goto err;
       /* Store fixed length fields */
-      pos= (char*) packet->ptr()+packet->length();
+      pos= (char*) local_packet->ptr()+local_packet->length();
       *pos++= 12;				// Length of packed fields
       int2store(pos, field.charsetnr);
       int4store(pos+2, field.length);
@@ -551,9 +559,9 @@ bool Protocol::send_fields(List<Item> *list, uint flag)
 		     cs, thd_charset) ||
 	  prot.store(field.col_name, (uint) strlen(field.col_name),
 		     cs, thd_charset) ||
-	  packet->realloc(packet->length()+10))
+	  local_packet->realloc(local_packet->length()+10))
 	goto err;
-      pos= (char*) packet->ptr()+packet->length();
+      pos= (char*) local_packet->ptr()+local_packet->length();
 
 #ifdef TO_BE_DELETED_IN_6
       if (!(thd->client_capabilities & CLIENT_LONG_FLAG))
@@ -580,7 +588,7 @@ bool Protocol::send_fields(List<Item> *list, uint flag)
 	pos+= 10;
       }
     }
-    packet->length((uint) (pos - packet->ptr()));
+    local_packet->length((uint) (pos - local_packet->ptr()));
     if (flag & 2)
       item->send(&prot, &tmp);			// Send default value
     if (prot.write())