Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint

into  recycle.(none):/src/bug23736/my51-bug23736

1 files changed, 9 insertions, 8 deletions

diff --git a/include/my_sys.h b/include/my_sys.h
index 8e831b448d7..cff8c73c9ff 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -312,8 +312,17 @@ struct st_my_file_info
 
 extern struct st_my_file_info *my_file_info;
 
+typedef struct st_dynamic_array
+{
+  char *buffer;
+  uint elements,max_element;
+  uint alloc_increment;
+  uint size_of_element;
+} DYNAMIC_ARRAY;
+
 typedef struct st_my_tmpdir
 {
+  DYNAMIC_ARRAY full_list;
   char **list;
   uint cur, max;
 #ifdef THREAD
@@ -321,14 +330,6 @@ typedef struct st_my_tmpdir
 #endif
 } MY_TMPDIR;
 
-typedef struct st_dynamic_array
-{
-  char *buffer;
-  uint elements,max_element;
-  uint alloc_increment;
-  uint size_of_element;
-} DYNAMIC_ARRAY;
-
 typedef struct st_dynamic_string
 {
   char *str;