diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sql/Makefile.am | 2 | ||||
| -rw-r--r-- | sql/sql_manager.cc | 1 | ||||
| -rw-r--r-- | sql/sql_manager.h | 19 |
4 files changed, 2 insertions, 22 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 95073b95ad6..d53da01bcff 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -29,7 +29,7 @@ ADD_DEFINITIONS(-DHAVE_ROW_BASED_REPLICATION -DMYSQL_SERVER ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc discover.cc ../libmysql/errmsg.c field.cc field_conv.cc filesort.cc gstream.cc ha_heap.cc ha_myisam.cc ha_myisammrg.cc - ha_innodb.cc ha_partition.cc ha_federated.cc ha_berkeley.cc + ha_innodb.cc ha_partition.cc ha_federated.cc handler.cc hash_filo.cc hash_filo.h hostname.cc init.cc item.cc item_buff.cc item_cmpfunc.cc item_create.cc item_func.cc item_geofunc.cc item_row.cc diff --git a/sql/Makefile.am b/sql/Makefile.am index c9cfaf9f158..5c509707f51 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -47,7 +47,7 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ item_create.h item_subselect.h item_row.h \ mysql_priv.h item_geofunc.h sql_bitmap.h \ procedure.h sql_class.h sql_lex.h sql_list.h \ - sql_manager.h sql_map.h sql_string.h unireg.h \ + sql_map.h sql_string.h unireg.h \ sql_error.h field.h handler.h mysqld_suffix.h \ ha_heap.h ha_myisam.h ha_myisammrg.h ha_partition.h \ ha_innodb.h ha_federated.h \ diff --git a/sql/sql_manager.cc b/sql/sql_manager.cc index f580bcb16d9..b3c67ab5db7 100644 --- a/sql/sql_manager.cc +++ b/sql/sql_manager.cc @@ -23,7 +23,6 @@ */ #include "mysql_priv.h" -#include "sql_manager.h" ulong volatile manager_status; bool volatile manager_thread_in_use; diff --git a/sql/sql_manager.h b/sql/sql_manager.h deleted file mode 100644 index d42deb8ff81..00000000000 --- a/sql/sql_manager.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -#ifdef WITH_BERKELEY_STORAGE_ENGINE -void berkeley_cleanup_log_files(void); -#endif /* WITH_BERKELEY_STORAGE_ENGINE */ |