Commit 53f0fb08 authored by unknown's avatar unknown
Browse files

merge 


sql/mysqld.cc:
  Auto merged
parents 6f7bccd1 7a71bd4b

include/my_dbug.h

+1 −1
Original line number Diff line number Diff line
@@ -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_(uint);

extern	void _db_output_(uint flag);

extern	void _db_lock_file(void);

extern	void _db_unlock_file(void);

sql/mysqld.cc

+0 −4
Original line number Diff line number Diff line
@@ -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) \