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

into cane.mysql.fi:/usr/home/tim/my/work

Merge work.mysql.com:/home/bk/mysql
into cane.mysql.fi:/usr/home/tim/my/work
15de4ca8 · unknown · 51c43b9b · 0cb7d364 · 15de4ca8
Commit 15de4ca8 authored Dec 15, 2000 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/sql_show.cc sql/sql_show.cc +2 -2

No files found.
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -531,7 +531,6 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list)
 }


-#ifdef HAVE_BERKELEY_DB
 int
 mysqld_show_logs(THD *thd)
 {
@@ -546,13 +545,14 @@ mysqld_show_logs(THD *thd)
  if (send_fields(thd,field_list,1))
    DBUG_RETURN(1);

+#ifdef HAVE_BERKELEY_DB
  if (berkeley_show_logs(thd))
    DBUG_RETURN(1);
+#endif

  send_eof(&thd->net);
  DBUG_RETURN(0);
 }
-#endif


 int