diff options
author | unknown <serg@serg.mylan> | 2005-09-25 16:07:13 +0200 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2005-09-25 16:07:13 +0200 |
commit | ddd18a89ad93929b4f57d78af7c8a92892ebfba3 (patch) | |
tree | 08b58a0e22f1db9621574bbce1696b09b003bfe8 /sql | |
parent | bd8b5dc8457ebed6489eeaa07c0beafd068d0dad (diff) | |
parent | cbad9e2c69e4f5b0ed22d1179d4ff24aa1380eca (diff) | |
download | mariadb-git-ddd18a89ad93929b4f57d78af7c8a92892ebfba3.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
Diffstat (limited to 'sql')
-rw-r--r-- | sql/examples/ha_tina.cc | 10 | ||||
-rw-r--r-- | sql/examples/ha_tina.h | 3 | ||||
-rw-r--r-- | sql/handler.cc | 4 |
3 files changed, 17 insertions, 0 deletions
diff --git a/sql/examples/ha_tina.cc b/sql/examples/ha_tina.cc index e01cc7cc980..5663cd829bd 100644 --- a/sql/examples/ha_tina.cc +++ b/sql/examples/ha_tina.cc @@ -234,6 +234,16 @@ static int free_share(TINA_SHARE *share) DBUG_RETURN(result_code); } +bool tina_end() +{ + if (tina_init) + { + hash_free(&tina_open_tables); + VOID(pthread_mutex_destroy(&tina_mutex)); + } + tina_init= 0; + return FALSE; +} /* Finds the end of a line. diff --git a/sql/examples/ha_tina.h b/sql/examples/ha_tina.h index 5679d77a4dc..1ccb3418771 100644 --- a/sql/examples/ha_tina.h +++ b/sql/examples/ha_tina.h @@ -126,3 +126,6 @@ public: int find_current_row(byte *buf); int chain_append(); }; + +bool tina_end(); + diff --git a/sql/handler.cc b/sql/handler.cc index e0698b37e5f..b7b599a0a90 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -579,6 +579,10 @@ int ha_panic(enum ha_panic_function flag) if (have_archive_db == SHOW_OPTION_YES) error|= archive_db_end(); #endif +#ifdef HAVE_CSV_DB + if (have_csv_db == SHOW_OPTION_YES) + error|= tina_end(); +#endif if (ha_finish_errors()) error= 1; return error; |