diff options
| author | monty@mashka.mysql.fi <> | 2002-09-03 16:50:59 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-09-03 16:50:59 +0300 |
| commit | d11512ccd2cfddd03b2600605795ae5f8ad5df99 (patch) | |
| tree | 49c9c296594ec980d17f9b5dadb43ea3befedcd3 /sql | |
| parent | 93e033fabc8e338e318d2ddc1819967be2ed26f7 (diff) | |
| parent | fee5128d255e04e3c9e09ce93df73bbac2cf1493 (diff) | |
| download | mariadb-git-d11512ccd2cfddd03b2600605795ae5f8ad5df99.tar.gz | |
Merge mashka.mysql.fi:/home/my/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-4.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysql_priv.h | 1 | ||||
| -rw-r--r-- | sql/sql_table.cc | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 7e3a5aa98d3..f2a59a8e77e 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -524,6 +524,7 @@ bool rm_temporary_table(enum db_type base, char *path); bool send_fields(THD *thd,List<Item> &item,uint send_field_count); void free_io_cache(TABLE *entry); void intern_close_table(TABLE *entry); +bool close_thread_table(THD *thd, TABLE **table_ptr); void close_thread_tables(THD *thd,bool locked=0); bool close_thread_table(THD *thd, TABLE **table_ptr); void close_temporary_tables(THD *thd); diff --git a/sql/sql_table.cc b/sql/sql_table.cc index de4e285b128..12d41ae8843 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -19,6 +19,9 @@ #include "mysql_priv.h" #include <hash.h> +#ifdef HAVE_BERKELEY_DB +#include <ha_berkeley.h> +#endif #include <myisam.h> #ifdef HAVE_BERKELEY_DB #include <ha_berkeley.h> |