Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

BitKeeper/etc/logging_ok:
  auto-union

1 files changed, 2 insertions, 0 deletions

diff --git a/include/myisam.h b/include/myisam.h
index 34babba163c..de97398fc51 100644
--- a/include/myisam.h
+++ b/include/myisam.h
@@ -68,6 +68,7 @@ typedef struct st_mi_isaminfo		/* Struct from h_info */
   ulong mean_reclength;			/* Mean recordlength (if packed) */
   ulonglong auto_increment;
   ulonglong key_map;			/* Which keys are used */
+  char  *data_file_name, *index_file_name;
   uint  keys;				/* Number of keys in use */
   uint	options;			/* HA_OPTIONS_... used */
   int	errkey,				/* With key was dupplicated on err */
@@ -86,6 +87,7 @@ typedef struct st_mi_isaminfo		/* Struct from h_info */
 
 typedef struct st_mi_create_info
 {
+  char *index_file_name, *data_file_name;	/* If using symlinks */
   ha_rows max_rows;
   ha_rows reloc_rows;
   ulonglong auto_increment;