summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-07-17 21:04:01 +0300
committermonty@hundin.mysql.fi <>2001-07-17 21:04:01 +0300
commitaecef7614e1c6d131417f2b21d2cddc9199c3ab2 (patch)
treef19e7e378a6170f04e3eebee868b77be238b17d7 /sql/sql_show.cc
parent02f72a801b2f29d5c604da72bfcf53c61706ce6f (diff)
downloadmariadb-git-aecef7614e1c6d131417f2b21d2cddc9199c3ab2.tar.gz
Removed wrong warning from thr_lock
Fixed problem with UPDATE and BDB tables Fixed problem with GRANT FILE privilege on database level mysqld --warnings works now Fixed problem with SHOW OPEN TABLES when not using BDB Added some tests for ALTER TABLE to the test scripts
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r--sql/sql_show.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 84dc5931139..637ab4fe7e9 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -599,7 +599,7 @@ mysqld_show_logs(THD *thd)
DBUG_RETURN(1);
#ifdef HAVE_BERKELEY_DB
- if (berkeley_show_logs(thd))
+ if (!berkeley_skip && berkeley_show_logs(thd))
DBUG_RETURN(-1);
#endif