diff options
| author | tim@cane.mysql.fi <> | 2000-12-15 18:01:57 +0200 |
|---|---|---|
| committer | tim@cane.mysql.fi <> | 2000-12-15 18:01:57 +0200 |
| commit | 574b2e932c750cbb82cd1b8960fff771fb176f64 (patch) | |
| tree | 1477aaa8377d9fd1e6c36c966412d62138035786 | |
| parent | b58d92652ba25cfbc139c3159027e12068f2a863 (diff) | |
| parent | b13b08fd219799207da361a6a6f37cb1e87fae80 (diff) | |
| download | mariadb-git-574b2e932c750cbb82cd1b8960fff771fb176f64.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into cane.mysql.fi:/usr/home/tim/my/work
| -rw-r--r-- | sql/sql_show.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 8e7b12936ba..a05a5fcebe9 100644 --- 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 |