diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 9f94b7a6bfd..a402e06a5a1 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1 +1,6 @@
+heikki@donna.mysql.fi
+jani@hynda.mysql.fi
+monty@donna.mysql.fi
+paul@central.snake.net
 sasha@mysql.sashanet.com
+serg@serg.mysql.com
diff --git a/Docs/manual.texi b/Docs/manual.texi
index 859c76b513c..215a5460087 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -13744,7 +13744,7 @@ in ANSI mode. @xref{ANSI mode}.
 
 @multitable @columnfractions .15 .15 .70
 @item @strong{Identifier} @tab @strong{Max length} @tab @strong{Allowed characters}
-@item Database @tab 64 @tab Any character that is allowed in a directory name except @samp{/}.
+@item Database @tab 64 @tab Any character that is allowed in a directory name except @samp{/} or @samp{.}.
 @item Table @tab 64 @tab Any character that is allowed in a file name, except @samp{/} or @samp{.}.
 @item Column @tab 64 @tab All characters.
 @item Alias @tab 255 @tab All characters.
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index ed55c2b77ed..5243498f7fc 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -264,9 +264,10 @@ bool mysql_change_db(THD *thd,const char *name)
     send_error(&thd->net,ER_NO_DB_ERROR);	/* purecov: inspected */
     DBUG_RETURN(1);				/* purecov: inspected */
   }
-  if (length > NAME_LEN)
+  if ((length > NAME_LEN) || check_db_name(dbname))
   {
     net_printf(&thd->net,ER_WRONG_DB_NAME, dbname);
+    x_free(dbname);
     DBUG_RETURN(1);
   }
   DBUG_PRINT("general",("Use database: %s", dbname));
diff --git a/sql/table.cc b/sql/table.cc
index a6d524840d9..eed4170c14a 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -1052,7 +1052,7 @@ bool check_db_name(const char *name)
       }
     }
 #endif
-    if (*name == '/' || *name == FN_LIBCHAR)
+    if (*name == '/' || *name == FN_LIBCHAR || *name == FN_EXTCHAR)
       return 1;
     name++;
   }