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

into  chilla.local:/home/mydev/mysql-4.1-axmrg

mysql-test/Makefile.am

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

sql/examples/ha_tina.cc

@@ -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.
   Currently only supports files written on a UNIX OS.

sql/examples/ha_tina.h

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

sql/handler.cc

@@ -340,6 +340,10 @@ int ha_panic(enum ha_panic_function flag)
 #ifdef HAVE_ARCHIVE_DB
   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
   return error;
 } /* ha_panic */