Fix spelling mistakes in MyISAM code comments

19 files changed, 29 insertions, 29 deletions

diff --git a/storage/myisam/NEWS b/storage/myisam/NEWS
index bb1f141610b..302adacf942 100644
--- a/storage/myisam/NEWS
+++ b/storage/myisam/NEWS
@@ -26,7 +26,7 @@ New features compared to NISAM:
 - Index on BLOB and VARCHAR.
 - One can now have NULL in an index.  This takes 0-1 bytes / key.
 - MYISAM will allow one to specify one AUTO_INCREMENT column;  MYISAM will
-  automaticly update this on INSERT/UPDATE. The AUTO_INCREMENT value can be
+  automatically update this on INSERT/UPDATE. The AUTO_INCREMENT value can be
   reset with myisamchk.
 - Max key length will be 500 by default;  In cases of longer keys than 250,
   a bigger key block size than the default of 1024 byes is used for this key.
@@ -39,7 +39,7 @@ New features compared to NISAM:
 - 'myisamchk -a' stores statistic for key parts (and not only for whole keys
    as in NISAM).
 - Dynamic size rows will now be much less fragmented when mixing deletes with
-  update and insert.  This is done by automaticly combine adjacent deleted
+  update and insert.  This is done by automatically combining adjacent deleted
   blocks and by extending blocks if the next block is deleted.
 - For dynamic size rows, the delete link contains a pointer to itself
   (to make repairs easier).
diff --git a/storage/myisam/ft_boolean_search.c b/storage/myisam/ft_boolean_search.c
index b9ab23b93be..140b6c1d583 100644
--- a/storage/myisam/ft_boolean_search.c
+++ b/storage/myisam/ft_boolean_search.c
@@ -335,7 +335,7 @@ static int _ftb_no_dupes_cmp(void* not_used __attribute__((unused)),
   When performing prefix search (a word with truncation operator), we
   must preserve original prefix to ensure that characters which may be
   expanded/contracted do not break the prefix. This is done by storing
-  newly found key immediatly after the original word in ftbw->word
+  newly found key immediately after the original word in ftbw->word
   buffer.
 
   ftbw->word= LENGTH WORD [ LENGTH1 WORD1 ] WEIGHT REFERENCE
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc
index 7aab938f383..57f69044ba3 100644
--- a/storage/myisam/ha_myisam.cc
+++ b/storage/myisam/ha_myisam.cc
@@ -730,8 +730,8 @@ int ha_myisam::open(const char *name, int mode, uint test_if_locked)
     growing files. Using an open_flag instead of calling mi_extra(...
     HA_EXTRA_MMAP ...) after mi_open() has the advantage that the
     mapping is not repeated for every open, but just done on the initial
-    open, when the MyISAM share is created. Everytime the server
-    requires to open a new instance of a table it calls this method. We
+    open, when the MyISAM share is created. Every time the server
+    requires opening a new instance of a table it calls this method. We
     will always supply HA_OPEN_MMAP for a permanent table. However, the
     MyISAM storage engine will ignore this flag if this is a secondary
     open of a table that is in use by other threads already (if the
diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c
index 35ec615d99b..f36fffbdd1d 100644
--- a/storage/myisam/mi_check.c
+++ b/storage/myisam/mi_check.c
@@ -288,7 +288,7 @@ static int check_k_link(HA_CHECK *param, register MI_INFO *info, uint nr)
     /*
       Read the key block with MI_MIN_KEY_BLOCK_LENGTH to find next link.
       If the key cache block size is smaller than block_size, we can so
-      avoid unecessary eviction of cache block.
+      avoid unnecessary eviction of cache block.
     */
     if (!(buff=key_cache_read(info->s->key_cache,
                               info->s->kfile, next_link, DFLT_INIT_HITS,
@@ -1900,7 +1900,7 @@ int flush_blocks(HA_CHECK *param, KEY_CACHE *key_cache, File file,
 } /* flush_blocks */
 
 
-	/* Sort index for more efficent reads */
+	/* Sort index for more efficient reads */
 
 int mi_sort_index(HA_CHECK *param, register MI_INFO *info, char * name)
 {
@@ -3043,13 +3043,13 @@ err:
   /*
     Destroy the write cache. The master thread did already detach from
     the share by remove_io_thread() or it was not yet started (if the
-    error happend before creating the thread).
+    error happened before creating the thread).
   */
   (void) end_io_cache(&info->rec_cache);
   /*
     Destroy the new data cache in case of non-quick repair. All slave
     threads did either detach from the share by remove_io_thread()
-    already or they were not yet started (if the error happend before
+    already or they were not yet started (if the error happened before
     creating the threads).
   */
   if (!rep_quick && my_b_inited(&new_data_cache))
@@ -4585,7 +4585,7 @@ void update_auto_increment_key(HA_CHECK *param, MI_INFO *info,
          keypart_k=c_k for arbitrary constants c_1 ... c_k) 
      
      = {assuming that values have uniform distribution and index contains all
-        tuples from the domain (or that {c_1, ..., c_k} tuple is choosen from
+        tuples from the domain (or that {c_1, ..., c_k} tuple is chosen from
         index tuples}
      
      = #tuples-in-the-index / #distinct-tuples-in-the-index.
diff --git a/storage/myisam/mi_create.c b/storage/myisam/mi_create.c
index 9a3a7788587..906f95f6e62 100644
--- a/storage/myisam/mi_create.c
+++ b/storage/myisam/mi_create.c
@@ -607,7 +607,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
     klinkname_ptr= klinkname;
     /*
       Don't create the table if the link or file exists to ensure that one
-      doesn't accidently destroy another table.
+      doesn't accidentally destroy another table.
     */
     create_flag=0;
   }
diff --git a/storage/myisam/mi_delete.c b/storage/myisam/mi_delete.c
index 4930ba78eb1..d36c9fba0b2 100644
--- a/storage/myisam/mi_delete.c
+++ b/storage/myisam/mi_delete.c
@@ -327,7 +327,7 @@ static int d_search(register MI_INFO *info, register MI_KEYDEF *keyinfo,
     {
       DBUG_PRINT("error",("Didn't find key"));
       mi_print_error(info->s, HA_ERR_CRASHED);
-      my_errno=HA_ERR_CRASHED;		/* This should newer happend */
+      my_errno=HA_ERR_CRASHED;		/* This should never happen */
       goto err;
     }
     save_flag=0;
diff --git a/storage/myisam/mi_dynrec.c b/storage/myisam/mi_dynrec.c
index cfe5a17c9f0..1fd2830dc0e 100644
--- a/storage/myisam/mi_dynrec.c
+++ b/storage/myisam/mi_dynrec.c
@@ -885,8 +885,8 @@ static int update_dynamic_record(MI_INFO *info, my_off_t filepos, uchar *record,
 	  /*
 	    Check if next block is a deleted block
 	    Above we have MI_MIN_BLOCK_LENGTH to avoid the problem where
-	    the next block is so small it can't be splited which could
-	    casue problems
+	    the next block is so small it can't be split which could
+	    cause problems
 	  */
 
 	  MI_BLOCK_INFO del_block;
diff --git a/storage/myisam/mi_extra.c b/storage/myisam/mi_extra.c
index cc3d7183458..f68c1339488 100644
--- a/storage/myisam/mi_extra.c
+++ b/storage/myisam/mi_extra.c
@@ -211,7 +211,7 @@ int mi_extra(MI_INFO *info, enum ha_extra_function function, void *extra_arg)
     info->read_record=	share->read_record;
     info->opt_flag&= ~(KEY_READ_USED | REMEMBER_OLD_POS);
     break;
-  case HA_EXTRA_NO_USER_CHANGE: /* Database is somehow locked agains changes */
+  case HA_EXTRA_NO_USER_CHANGE: /* Database is somehow locked against changes */
     info->lock_type= F_EXTRA_LCK; /* Simulate as locked */
     break;
   case HA_EXTRA_WAIT_LOCK:
@@ -349,7 +349,7 @@ int mi_extra(MI_INFO *info, enum ha_extra_function function, void *extra_arg)
     if (share->base.blobs)
       mi_alloc_rec_buff(info, -1, &info->rec_buff);
     break;
-  case HA_EXTRA_NORMAL:				/* Theese isn't in use */
+  case HA_EXTRA_NORMAL:				/* These aren't in use */
     info->quick_mode=0;
     break;
   case HA_EXTRA_QUICK:
diff --git a/storage/myisam/mi_key.c b/storage/myisam/mi_key.c
index b5ca83600e6..c81bc674685 100644
--- a/storage/myisam/mi_key.c
+++ b/storage/myisam/mi_key.c
@@ -605,7 +605,7 @@ ulonglong retrieve_auto_increment(MI_INFO *info,const uchar *record)
   }
 
   /*
-    The following code works becasue if s_value < 0 then value is 0
+    The following code works because if s_value < 0 then value is 0
     and if s_value == 0 then value will contain either s_value or the
     correct value.
   */
diff --git a/storage/myisam/mi_locking.c b/storage/myisam/mi_locking.c
index 33260ee9fd5..71fbdabae2d 100644
--- a/storage/myisam/mi_locking.c
+++ b/storage/myisam/mi_locking.c
@@ -448,7 +448,7 @@ my_bool mi_check_status(void *param)
 
   @param  org_table
   @param  new_table that should point on org_lock.  new_table is 0
-          in case this is the first occurence of the table in the lock
+          in case this is the first occurrence of the table in the lock
           structure.
 */
 
diff --git a/storage/myisam/mi_packrec.c b/storage/myisam/mi_packrec.c
index 362c4867e0d..5319e7390a3 100644
--- a/storage/myisam/mi_packrec.c
+++ b/storage/myisam/mi_packrec.c
@@ -810,7 +810,7 @@ static void (*get_unpack_function(MI_COLUMNDEF *rec))
     return &uf_varchar2;
   case FIELD_LAST:
   default:
-    return 0;			/* This should never happend */
+    return 0;			/* This should never happen */
   }
 }
 
diff --git a/storage/myisam/mi_rfirst.c b/storage/myisam/mi_rfirst.c
index 7bfe87867ee..26f6921bdf9 100644
--- a/storage/myisam/mi_rfirst.c
+++ b/storage/myisam/mi_rfirst.c
@@ -16,7 +16,7 @@
 
 #include "myisamdef.h"
 
-	/*  Read first row through  a specfic key */
+	/*  Read first row through a specific key */
 
 int mi_rfirst(MI_INFO *info, uchar *buf, int inx)
 {
diff --git a/storage/myisam/mi_search.c b/storage/myisam/mi_search.c
index 85ea136a4c6..1bd5f4983bc 100644
--- a/storage/myisam/mi_search.c
+++ b/storage/myisam/mi_search.c
@@ -433,7 +433,7 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page,
 
       /*
         If prefix_len > cmplen then we are in the end-space comparison
-        phase. Do not try to acces the key any more ==> left= 0.
+        phase. Do not try to access the key any more ==> left= 0.
       */
       left= ((len <= cmplen) ? suffix_len :
              ((prefix_len < cmplen) ? cmplen - prefix_len : 0));
diff --git a/storage/myisam/mi_test_all.sh b/storage/myisam/mi_test_all.sh
index af0a3d4e769..fdd81becff5 100755
--- a/storage/myisam/mi_test_all.sh
+++ b/storage/myisam/mi_test_all.sh
@@ -19,8 +19,8 @@
 # MA 02110-1335  USA
 
 #
-# Execute some simple basic test on MyISAM libary to check if things
-# works at all.
+# Execute some simple basic tests on the MyISAM library to check if
+# things work at all.
 
 valgrind="valgrind --alignment=8 --leak-check=yes"
 silent="-s"
diff --git a/storage/myisam/myisamchk.c b/storage/myisam/myisamchk.c
index bb035e6b157..a9f67fad84a 100644
--- a/storage/myisam/myisamchk.c
+++ b/storage/myisam/myisamchk.c
@@ -373,7 +373,7 @@ static void usage(void)
 
   puts("Check options (check is the default action for myisamchk):\n\
   -c, --check	      Check table for errors.\n\
-  -e, --extend-check  Check the table VERY throughly.  Only use this in\n\
+  -e, --extend-check  Check the table VERY thoroughly.  Only use this in\n\
                       extreme cases as myisamchk should normally be able to\n\
                       find out if the table is ok even without this switch.\n\
   -F, --fast	      Check only tables that haven't been closed properly.\n\
diff --git a/storage/myisam/myisamdef.h b/storage/myisam/myisamdef.h
index a019d7f2351..67e9b99ecfe 100644
--- a/storage/myisam/myisamdef.h
+++ b/storage/myisam/myisamdef.h
@@ -192,7 +192,7 @@ typedef struct st_mi_isam_share
   ulong last_process;                   /* For table-change-check */
   ulong last_version;                   /* Version on start */
   ulong options;                        /* Options used */
-  ulong min_pack_length;                /* Theese are used by packed data */
+  ulong min_pack_length;                /* These are used by packed data */
   ulong max_pack_length;
   ulong state_diff_length;
   uint	rec_reflength;			/* rec_reflength in use now */
diff --git a/storage/myisam/myisamlog.c b/storage/myisam/myisamlog.c
index 3880826d981..eeb754d2cc9 100644
--- a/storage/myisam/myisamlog.c
+++ b/storage/myisam/myisamlog.c
@@ -415,7 +415,7 @@ static int examine_log(char * file_name, char **table_names)
 		     left_root_right);
       file_info.id=open_param.max_id+1;
       /*
-       * In the line below +10 is added to accomodate '<' and '>' chars
+       * In the line below +10 is added to accommodate '<' and '>' chars
        * plus '\0' at the end, so that there is place for 7 digits.
        * It is  improbable that same table can have that many entries in 
        * the table cache.
diff --git a/storage/myisam/myisampack.c b/storage/myisam/myisampack.c
index f8d76d8770b..a331bf890f7 100644
--- a/storage/myisam/myisampack.c
+++ b/storage/myisam/myisampack.c
@@ -108,7 +108,7 @@ typedef struct st_isam_mrg {
   MI_INFO **file,**current,**end;
   uint free_file;
   uint count;
-  uint	min_pack_length;		/* Theese is used by packed data */
+  uint	min_pack_length;		/* These are used by packed data */
   uint	max_pack_length;
   uint	ref_length;
   uint	max_blob_length;
@@ -1237,7 +1237,7 @@ static void check_counts(HUFF_COUNTS *huff_counts, uint trees,
 	huff_counts->counts[0]=0;
 	goto found_pack;
       }
-      /* Remeber the number of significant spaces. */
+      /* Remember the number of significant spaces. */
       old_space_count=huff_counts->counts[' '];
       /* Add all leading and trailing spaces. */
       huff_counts->counts[' ']+= (huff_counts->tot_end_space +
diff --git a/storage/myisam/sort.c b/storage/myisam/sort.c
index c07b1347ed4..fe35c1ba2ce 100644
--- a/storage/myisam/sort.c
+++ b/storage/myisam/sort.c
@@ -815,7 +815,7 @@ cleanup:
     buffpek		Where to read from
     sort_length		max length to read
   RESULT
-    > 0	Ammount of bytes read
+    > 0	Number of bytes read
     -1	Error
 */