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/myisampack.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/myisampack.c')
| -rw-r--r-- | storage/myisam/myisampack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisam/myisampack.c b/storage/myisam/myisampack.c index 2ab26b45f07..04a12a21f45 100644 --- a/storage/myisam/myisampack.c +++ b/storage/myisam/myisampack.c @@ -110,7 +110,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 + |