database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
This commit is contained in:
unknown
2007-02-02 20:23:03 +01:00
parent 98b9ac693a 04cbadde7a
commit 0dc19dadb9
4 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/Makefile.am
View File

@ -33,7 +33,7 @@ endif
benchdir_root= $(prefix) benchdir_root= $(prefix)
testdir = $(benchdir_root)/mysql-test testdir = $(benchdir_root)/mysql-test
EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh \ EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh \
$(PRESCRIPTS) valgrind.supp $(PRESCRIPTS)
EXTRA_DIST = $(EXTRA_SCRIPTS) EXTRA_DIST = $(EXTRA_SCRIPTS)
GENSCRIPTS = mysql-test-run-shell mysql-test-run install_test_db mtr GENSCRIPTS = mysql-test-run-shell mysql-test-run install_test_db mtr
PRESCRIPTS = mysql-test-run.pl PRESCRIPTS = mysql-test-run.pl

12
sql/examples/ha_tina.cc
View File

@ -220,6 +220,18 @@ static int free_share(TINA_SHARE *share)
} }
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. Finds the end of a line.
Currently only supports files written on a UNIX OS. Currently only supports files written on a UNIX OS.

2
sql/examples/ha_tina.h
View File

@ -136,3 +136,5 @@ class ha_tina: public handler
int find_current_row(byte *buf); int find_current_row(byte *buf);
int chain_append(); int chain_append();
}; };
bool tina_end();

4
sql/handler.cc
View File

@ -340,6 +340,10 @@ int ha_panic(enum ha_panic_function flag)
#ifdef HAVE_ARCHIVE_DB #ifdef HAVE_ARCHIVE_DB
if (have_archive_db == SHOW_OPTION_YES) if (have_archive_db == SHOW_OPTION_YES)
error|= archive_db_end(); error|= archive_db_end();
#endif
#ifdef HAVE_CSV_DB
if (have_csv_db == SHOW_OPTION_YES)
error|= tina_end();
#endif #endif
return error; return error;
} /* ha_panic */ } /* ha_panic */