Fix a couple of compilation failures.

include/my_dbug.h:
  Fix conflicting declaration and definition of db_output.
sql/mysqld.cc:
  Fix a compilation failure.

include/my_dbug.h

@@ -39,7 +39,7 @@ extern	void _db_pargs_(uint _line_,const char *keyword);
 extern	void _db_doprnt_ _VARARGS((const char *format,...));
 extern	void _db_dump_(uint _line_,const char *keyword,const char *memory,
 		       uint length);
-extern	void _db_output_(void);
+extern	void _db_output_(uint);
 extern	void _db_lock_file(void);
 extern	void _db_unlock_file(void);
 

sql/mysqld.cc

@@ -294,7 +294,7 @@ static I_List<THD> thread_cache;
 
 static pthread_cond_t COND_thread_cache, COND_flush_thread_cache;
 
-#ifdef HAVE_BERKLEY_DB
+#ifdef HAVE_BERKELEY_DB
 static my_bool opt_sync_bdb_logs;
 #endif