Merge

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
Docs/manual.texi:
  SCCS merged

4 files changed, 6 insertions, 16 deletions

diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc
index ac88c802949..60e0c4eec94 100644
--- a/sql/ha_myisam.cc
+++ b/sql/ha_myisam.cc
@@ -1136,19 +1136,9 @@ int ha_myisam::ft_read(byte * buf)
 
   thread_safe_increment(ha_read_next_count,&LOCK_status); // why ?
 
-  if ((error=ft_read_next((FT_DOCLIST *) ft_handler,(char*) buf)))
-    ft_handler=NULL; // Magic here ! See Item_func_match::val()
-                     // and ha_myisam::index_init()
+  error=ft_read_next((FT_DOCLIST *) ft_handler,(char*) buf);
+
   table->status=error ? STATUS_NOT_FOUND: 0;
   return error;
 }
 
-int ha_myisam::index_init(uint idx)
-{
-  if (idx != active_index)
-    ft_handler=NULL; // Magic here !
-
-  active_index=idx;
-  return 0;
-}
-
diff --git a/sql/ha_myisam.h b/sql/ha_myisam.h
index c72b29ed3c7..6451e2b80ee 100644
--- a/sql/ha_myisam.h
+++ b/sql/ha_myisam.h
@@ -71,7 +71,7 @@ class ha_myisam: public handler
   int index_first(byte * buf);
   int index_last(byte * buf);
   int index_next_same(byte *buf, const byte *key, uint keylen);
-  int index_init(uint idx);
+  int index_end() { ft_handler=NULL; return 0; }
   int ft_init()
          { if(!ft_handler) return 1; ft_reinit_search(ft_handler); return 0; }
   void *ft_init_ext(uint inx,const byte *key, uint keylen, bool presort)
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 85d57914c78..2317c896dfd 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -781,8 +781,8 @@ bool change_password(THD *thd, const char *host, const char *user,
   length=(uint) strlen(new_password);
   new_password[length & 16]=0;
 
-  if (!thd || strcmp(thd->user,user) ||
-      my_strcasecmp(host,thd->host ? thd->host : thd->ip))
+  if (!thd || (!thd->slave_thread && ( strcmp(thd->user,user) ||
+	       my_strcasecmp(host,thd->host ? thd->host : thd->ip))))
   {
     if (check_access(thd, UPDATE_ACL, "mysql",0,1))
       return 1;
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 1d41ae6230a..1b46cc51bfc 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -408,7 +408,7 @@ pthread_handler_decl(handle_one_connection,arg)
     {
       sql_print_error(ER(ER_NEW_ABORTING_CONNECTION),
 		      thd->thread_id,(thd->db ? thd->db : "unconnected"),
-		      thd->user,
+		      thd->user ? thd->user : "unauthenticated",
 		      (thd->host ? thd->host : thd->ip ? thd->ip : "unknown"),
 		      (net->last_errno ? ER(net->last_errno) :
 		       ER(ER_UNKNOWN_ERROR)));