diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-09-24 11:16:36 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-09-24 11:18:39 +0400 |
| commit | 5f118b26c83960c8fa98bfd544f57ffd76b55304 (patch) | |
| tree | 762e9475ea3b0e402ebd0571a55958b377a3fab4 /storage/myisam/mi_check.c | |
| parent | 896974fc3d721aabe1afbf637a566cab856a731d (diff) | |
| parent | 67b0faa29e59387b74ae8547c96cf0f31fc3d9d1 (diff) | |
| download | mariadb-git-5f118b26c83960c8fa98bfd544f57ffd76b55304.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 10.1
Diffstat (limited to 'storage/myisam/mi_check.c')
| -rw-r--r-- | storage/myisam/mi_check.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c index 334ce75cd26..62f72078a9e 100644 --- a/storage/myisam/mi_check.c +++ b/storage/myisam/mi_check.c @@ -283,7 +283,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, @@ -1894,7 +1894,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) { @@ -3047,13 +3047,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)) @@ -4591,7 +4591,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. |