Skip to content

Commit

Permalink
Fix spelling mistakes in MyISAM code comments
Browse files Browse the repository at this point in the history
  • Loading branch information
iangilfillan authored and cvicentiu committed Sep 20, 2019
1 parent f541d3f commit 38fa014
Show file tree
Hide file tree
Showing 19 changed files with 29 additions and 29 deletions.
4 changes: 2 additions & 2 deletions storage/myisam/NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion storage/myisam/ft_boolean_search.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions storage/myisam/ha_myisam.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions storage/myisam/mi_check.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -3043,13 +3043,13 @@ int mi_repair_parallel(HA_CHECK *param, register MI_INFO *info,
/*
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))
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion storage/myisam/mi_create.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion storage/myisam/mi_delete.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions storage/myisam/mi_dynrec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions storage/myisam/mi_extra.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion storage/myisam/mi_key.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
2 changes: 1 addition & 1 deletion storage/myisam/mi_locking.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/

Expand Down
2 changes: 1 addition & 1 deletion storage/myisam/mi_packrec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
}
}

Expand Down
2 changes: 1 addition & 1 deletion storage/myisam/mi_rfirst.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion storage/myisam/mi_search.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
4 changes: 2 additions & 2 deletions storage/myisam/mi_test_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion storage/myisam/myisamchk.c
Original file line number Diff line number Diff line change
Expand Up @@ -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\
Expand Down
2 changes: 1 addition & 1 deletion storage/myisam/myisamdef.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion storage/myisam/myisamlog.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions storage/myisam/myisampack.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 +
Expand Down
2 changes: 1 addition & 1 deletion storage/myisam/sort.c
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ static int merge_many_buff(MI_SORT_PARAM *info, uint keys,
buffpek Where to read from
sort_length max length to read
RESULT
> 0 Ammount of bytes read
> 0 Number of bytes read
-1 Error
*/

Expand Down

0 comments on commit 38fa014

Please sign in to comment.