bk commit into 5.0 tree (monty:1.1861)

[monty]

Below is the list of changes that have just been committed into a local
5.0 repository of monty. When monty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1861 05/05/18 21:12:59 monty@stripped +2 -0
  Fixed bug from last push

  sql/mysqld.cc
    1.455 05/05/18 21:12:55 monty@stripped +1 -5
    Fixed bug from last push

  include/my_dbug.h
    1.14 05/05/18 21:12:55 monty@stripped +1 -1
    Fixed bug from last push

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	monty
# Host:	narttu.mysql.com
# Root:	/home/my/mysql-5.0

--- 1.13/include/my_dbug.h	2005-05-18 19:00:14 +03:00
+++ 1.14/include/my_dbug.h	2005-05-18 21:12:55 +03:00
@@ -39,7 +39,7 @@
 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 flag);
 extern	void _db_lock_file(void);
 extern	void _db_unlock_file(void);
 

--- 1.454/sql/mysqld.cc	2005-05-18 19:00:14 +03:00
+++ 1.455/sql/mysqld.cc	2005-05-18 21:12:55 +03:00
@@ -39,11 +39,7 @@
 #else
 #define OPT_INNODB_DEFAULT 0
 #endif
-#ifdef HAVE_BERKLEY_DB
-#define OPT_BDB_DEFAULT 1
-#else
 #define OPT_BDB_DEFAULT 0
-#endif
 #ifdef HAVE_NDBCLUSTER_DB
 #define OPT_NDBCLUSTER_DEFAULT 0
 #if defined(NOT_ENOUGH_TESTED) \
@@ -294,7 +290,7 @@
 
 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