mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge

Browse source 
sql/mysqld.cc:
  Auto merged
This commit is contained in:
unknown 2005-05-18 21:16:14 +03:00
commit 53f0fb085d
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/my_dbug.h
View file

@ -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);

4
sql/mysqld.cc
View file

@ -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) \