Merge 10.5 into 10.6

1 files changed, 5 insertions, 4 deletions

diff --git a/include/my_sys.h b/include/my_sys.h
index dceae9b889e..2ad4e131b3f 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -463,18 +463,19 @@ typedef struct st_io_cache		/* Used when caching files */
     partial.
   */
   int	seek_not_done,error;
-  /* buffer_length is memory size allocated for buffer or write_buffer */
+  /* length of the buffer used for storing un-encrypted data */
   size_t	buffer_length;
   /* read_length is the same as buffer_length except when we use async io */
   size_t  read_length;
   myf	myflags;			/* Flags used to my_read/my_write */
   /*
-    alloced_buffer is 1 if the buffer was allocated by init_io_cache() and
-    0 if it was supplied by the user.
+    alloced_buffer is set to the size of the buffer allocated for the IO_CACHE.
+    Includes the overhead(storing key to ecnrypt and decrypt) for encryption.
+    Set to 0 if nothing is allocated.
     Currently READ_NET is the only one that will use a buffer allocated
     somewhere else
   */
-  my_bool alloced_buffer;
+  size_t alloced_buffer;
 } IO_CACHE;
 
 typedef int (*qsort2_cmp)(const void *, const void *, const void *);