Write UNION() for MERGE tables

Docs/manual.texi:
  Clearify when logging is done
myisam/myisamchk.c:
  Better error message
mysql-test/r/merge.result:
  Added test for SHOW CREATE on MERGE table
scripts/safe_mysqld.sh:
  Search by default in database directory
sql/ha_myisammrg.h:
  Add UNION() to SHOW CREATE TABLE
sql/sql_update.cc:
  removed compiler warning

1 files changed, 17 insertions, 0 deletions

diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc
index 4c562282090..181ae724cd8 100644
--- a/sql/ha_myisammrg.cc
+++ b/sql/ha_myisammrg.cc
@@ -238,3 +238,20 @@ int ha_myisammrg::create(const char *name, register TABLE *form,
   DBUG_RETURN(myrg_create(fn_format(buff,name,"","",2+4+16),
 			  (const char **) table_names, (my_bool) 0));
 }
+
+void ha_myisammrg::append_create_info(String *packet)
+{
+  char buff[FN_REFLEN];
+  packet->append(" UNION=(",8);
+  MYRG_TABLE *table,*first;
+
+  for (first=table=file->open_tables ; table != file->end_table ; table++)
+  {
+    char *name=table->table->s->filename;
+    fn_format(buff,name,"","",3);
+    if (table != first)
+      packet->append(',');
+    packet->append(buff,(uint) strlen(buff));
+  }
+  packet->append(')');
+}