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