Skip to content

M
MariaDB
Commit 15de4ca8 authored by unknown's avatar unknown
Browse files
Options

Merge work.mysql.com:/home/bk/mysql 

into cane.mysql.fi:/usr/home/tim/my/work
parents 51c43b9b 0cb7d364
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
sql/sql_show.cc
View file @ 15de4ca8
...@@ -531,7 +531,6 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list) ...@@ -531,7 +531,6 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list)
} }
#ifdef HAVE_BERKELEY_DB
int int
mysqld_show_logs(THD *thd) mysqld_show_logs(THD *thd)
{ {
...@@ -546,13 +545,14 @@ mysqld_show_logs(THD *thd) ...@@ -546,13 +545,14 @@ mysqld_show_logs(THD *thd)
if (send_fields(thd,field_list,1)) if (send_fields(thd,field_list,1))
DBUG_RETURN(1); DBUG_RETURN(1);
#ifdef HAVE_BERKELEY_DB
if (berkeley_show_logs(thd)) if (berkeley_show_logs(thd))
DBUG_RETURN(1); DBUG_RETURN(1);
#endif
send_eof(&thd->net); send_eof(&thd->net);
DBUG_RETURN(0); DBUG_RETURN(0);
} }
#endif
int int
......
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