diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 1052cc254f3..fa533a6aed7 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1,9 +1,10 @@
 jcole@tetra.spaceapes.com
 monty@donna.mysql.com
+monty@work.mysql.com
 mwagner@work.mysql.com
 paul@central.snake.net
 sasha@mysql.sashanet.com
 sasha@work.mysql.com
 serg@donna.mysql.com
+serg@serg.mysql.com
 tim@cane.mysql.fi
-monty@work.mysql.com
diff --git a/Docs/manual.texi b/Docs/manual.texi
index d395e8ec75b..ff087a85330 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -38946,7 +38946,7 @@ your @code{FULLTEXT} indexes.
 @end example
 line in @code{myisam/ftdefs.h} to
 @example
-#define GWS_IN_USE GWS_IDF
+#define GWS_IN_USE GWS_FREQ
 @end example
 and recompile @strong{MySQL}.
 There is no need to rebuild the indexes though.
diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c
index 194542afd7f..00c8910a573 100644
--- a/libmysql/errmsg.c
+++ b/libmysql/errmsg.c
@@ -36,7 +36,7 @@ const char *client_errors[]=
   "MySQL client got out of memory",
   "Wrong host info",
   "Localhost via UNIX socket",
-  "%s via TCP/IP",
+  "%-.64s via TCP/IP",
   "Error in server handshake",
   "Lost connection to MySQL server during query",
   "Commands out of sync; You can't run this command now",
@@ -62,11 +62,11 @@ const char *client_errors[]=
   "MySQL client run out of memory",
   "Wrong host info",
   "Localhost via UNIX socket",
-  "%s via TCP/IP",
+  "%-.64s via TCP/IP",
   "Error in server handshake",
   "Lost connection to MySQL server during query",
   "Commands out of sync;  You can't run this command now",
-  "%s via named pipe",
+  "%-.64s via named pipe",
   "Can't wait for named pipe to host: %-.64s  pipe: %-.32s (%lu)",
   "Can't open named pipe to host: %-.64s  pipe: %-.32s (%lu)",
   "Can't set state of named pipe to host: %-.64s  pipe: %-.32s (%lu)",
diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index ee9e3387119..037f66c54e5 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -376,7 +376,7 @@ int chk_key(MI_CHECK *param, register MI_INFO *info)
     if ((!(param->testflag & T_SILENT)))
       printf ("- check data record references index: %d\n",key+1);
     if (share->state.key_root[key] == HA_OFFSET_ERROR &&
-	info->state->records == 0)
+	(info->state->records == 0 || keyinfo->flag & HA_FULLTEXT))
       continue;
     if (!_mi_fetch_keypage(info,keyinfo,share->state.key_root[key],info->buff,
 			   0))