Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/jonas/src/mysql-4.1-ndb

BitKeeper/etc/logging_ok

@@ -95,6 +95,7 @@ miguel@hegel.(none)
 miguel@hegel.br
 miguel@hegel.local
 miguel@hegel.txg
+miguel@hegel.txg.br
 miguel@light.
 miguel@light.local
 miguel@sartre.local

libmysql/client_settings.h

@@ -18,7 +18,7 @@ extern uint		mysql_port;
 extern my_string	mysql_unix_port;
 
 #define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG |	  \
-                             CLIENT_LOCAL_FILES | CLIENT_TRANSACTIONS |   \
+                             CLIENT_TRANSACTIONS | \
 			     CLIENT_PROTOCOL_41 | CLIENT_SECURE_CONNECTION)
 
 sig_handler pipe_sig_handler(int sig __attribute__((unused)));

sql/sql_db.cc

@@ -560,7 +560,6 @@ int mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
   char	path[FN_REFLEN+16], tmp_db[NAME_LEN+1];
   MY_DIR *dirp;
   uint length;
-  my_dbopt_t *dbopt;
   DBUG_ENTER("mysql_rm_db");
 
   VOID(pthread_mutex_lock(&LOCK_mysql_create_db));