Updated manual about embedded version.

Speed up column-completion in 'mysql'
Don't use ISAM if HAVE_ISAM is not defined
A lot of fixes for the embedded version.  All libraries are now included in libmysqld.a
Changed arguments to convert_dirname() to make it more general.
Renamed files in the 'merge' directory to all use a common prefix.
Don't compile both assembler and C functions on x86

1 files changed, 40 insertions, 0 deletions

diff --git a/merge/mrg_close.c b/merge/mrg_close.c
new file mode 100644
index 00000000000..4879dbf4c36
--- /dev/null
+++ b/merge/mrg_close.c
@@ -0,0 +1,40 @@
+/* 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 */
+
+/* close a isam-database */
+
+#include "mrg_def.h"
+
+int mrg_close(register MRG_INFO *info)
+{
+  int error=0,new_error;
+  MRG_TABLE *file;
+  DBUG_ENTER("mrg_close");
+
+  for (file=info->open_tables ; file != info->end_table ; file++)
+    if ((new_error=nisam_close(file->table)))
+      error=new_error;
+  pthread_mutex_lock(&THR_LOCK_open);
+  mrg_open_list=list_delete(mrg_open_list,&info->open_list);
+  pthread_mutex_unlock(&THR_LOCK_open);
+  my_free((gptr) info,MYF(0));
+  if (error)
+  {
+    my_errno=error;
+    DBUG_RETURN(-1);
+  }
+  DBUG_RETURN(0);
+}