Skip to content

M
mariadb
Commit 7ef7b9ad authored by monty@mysql.com's avatar monty@mysql.com
Browse files
Options

merge

parents e7c62822 a9c4379c
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 5 deletions
include/my_dbug.h
View file @ 7ef7b9ad
...@@ -39,7 +39,7 @@ extern void _db_pargs_(uint _line_,const char *keyword); ...@@ -39,7 +39,7 @@ extern void _db_pargs_(uint _line_,const char *keyword);
extern void _db_doprnt_ _VARARGS((const char *format,...)); extern void _db_doprnt_ _VARARGS((const char *format,...));
extern void _db_dump_(uint _line_,const char *keyword,const char *memory, extern void _db_dump_(uint _line_,const char *keyword,const char *memory,
uint length); uint length);
extern void _db_output_(uint); extern void _db_output_(uint flag);
extern void _db_lock_file(void); extern void _db_lock_file(void);
extern void _db_unlock_file(void); extern void _db_unlock_file(void);
......
sql/mysqld.cc
View file @ 7ef7b9ad
...@@ -39,11 +39,7 @@ ...@@ -39,11 +39,7 @@
#else #else
#define OPT_INNODB_DEFAULT 0 #define OPT_INNODB_DEFAULT 0
#endif #endif
#ifdef HAVE_BERKLEY_DB
#define OPT_BDB_DEFAULT 1
#else
#define OPT_BDB_DEFAULT 0 #define OPT_BDB_DEFAULT 0
#endif
#ifdef HAVE_NDBCLUSTER_DB #ifdef HAVE_NDBCLUSTER_DB
#define OPT_NDBCLUSTER_DEFAULT 0 #define OPT_NDBCLUSTER_DEFAULT 0
#if defined(NOT_ENOUGH_TESTED) \ #if defined(NOT_ENOUGH_TESTED) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7