merge with 4.0.9

To get bug fixes for TCP/IP connections, FORCE INDEX and OPTIMIZE TABLE with NULL keys


client/mysqladmin.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/Makefile.am:
  Auto merged
include/my_base.h:
  Auto merged
innobase/log/log0log.c:
  Auto merged
myisam/ft_nlq_search.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
sql/lex.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql-bench/test-insert.sh:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
configure.in:
  merge with 4.0.9
innobase/btr/btr0pcur.c:
  merge with 4.0.9
myisam/mi_check.c:
  merge with 4.0.9
myisam/mi_search.c:
  merge with 4.0.9
mysql-test/t/myisam.test:
  merge with 4.0.9
sql/log_event.cc:
  merge with 4.0.9
sql/mysql_priv.h:
  merge with 4.0.9
sql/sql_lex.h:
  merge with 4.0.9
sql/sql_parse.cc:
  merge with 4.0.9
sql/sql_yacc.yy:
  merge with 4.0.9

1 files changed, 4 insertions, 1 deletions

diff --git a/sql/protocol.cc b/sql/protocol.cc
index 15f4ca9ad94..48ef9ecb71e 100644
--- a/sql/protocol.cc
+++ b/sql/protocol.cc
@@ -171,7 +171,10 @@ net_printf(THD *thd, uint errcode, ...)
   {
     if (thd->bootstrap)
     {
-      /* In bootstrap it's ok to print on stderr */
+      /*
+	In bootstrap it's ok to print on stderr
+	This may also happen when we get an error from a slave thread
+      */
       fprintf(stderr,"ERROR: %d  %s\n",errcode,text_pos);
       thd->fatal_error=1;
     }