database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merged with 3.23

Browse Source 
configure.in:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
Docs/manual.texi:
  merged
mysql-test/t/rpl_sporadic_master.test:
  merged
sql/Makefile.am:
  merged
sql/slave.h:
  merged
This commit is contained in:
unknown
2001-07-17 16:23:36 -06:00
parent 90acfb9ff3 4c26f24575
commit bab169b692
30 changed files with 331 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_show.cc
View File

@ -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