Merge work:/home/bk/mysql-4.1

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1

2 files changed, 15 insertions, 2 deletions

diff --git a/include/my_sys.h b/include/my_sys.h
index 6545077df72..f1b4841adb3 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -293,6 +293,14 @@ extern struct my_file_info
 #endif
 } my_file_info[MY_NFILE];
 
+typedef struct st_my_tmpdir
+{
+  char **list;
+  uint cur, max;
+#ifdef THREAD
+  pthread_mutex_t mutex;
+#endif
+} MY_TMPDIR;
 
 typedef struct st_dynamic_array
 {
@@ -582,6 +590,10 @@ extern void allow_break(void);
 #define allow_break()
 #endif
 
+extern my_bool init_tmpdir(MY_TMPDIR *tmpdir, const char *pathlist);
+extern char *my_tmpdir(MY_TMPDIR *tmpdir);
+extern void free_tmpdir(MY_TMPDIR *tmpdir);
+
 extern void my_remember_signal(int signal_number,sig_handler (*func)(int));
 extern uint dirname_part(my_string to,const char *name);
 extern uint dirname_length(const char *name);
diff --git a/include/myisam.h b/include/myisam.h
index eac517eb28a..acaf8bb7618 100644
--- a/include/myisam.h
+++ b/include/myisam.h
@@ -329,7 +329,8 @@ typedef struct st_mi_check_param
   uint8 language;
   my_bool using_global_keycache, opt_lock_memory, opt_follow_links;
   my_bool retry_repair, force_sort, calc_checksum;
-  char temp_filename[FN_REFLEN],*isam_file_name,*tmpdir;
+  char temp_filename[FN_REFLEN],*isam_file_name;
+  MY_TMPDIR *tmpdir;
   int tmpfile_createflag;
   myf myf_rw;
   IO_CACHE read_cache;
@@ -376,7 +377,7 @@ typedef struct st_mi_sort_param
   byte *rec_buff;
   void *wordlist, *wordptr;
   char *record;
-  char *tmpdir;
+  MY_TMPDIR *tmpdir;
   int (*key_cmp)(struct st_mi_sort_param *, const void *, const void *);
   int (*key_read)(struct st_mi_sort_param *,void *);
   int (*key_write)(struct st_mi_sort_param *, const void *);