Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
38fa0141
Commit
38fa0141
authored
Sep 12, 2019
by
Ian Gilfillan
Committed by
Vicențiu Ciorbaru
Sep 20, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spelling mistakes in MyISAM code comments
parent
f541d3f1
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
29 additions
and
29 deletions
+29
-29
storage/myisam/NEWS
storage/myisam/NEWS
+2
-2
storage/myisam/ft_boolean_search.c
storage/myisam/ft_boolean_search.c
+1
-1
storage/myisam/ha_myisam.cc
storage/myisam/ha_myisam.cc
+2
-2
storage/myisam/mi_check.c
storage/myisam/mi_check.c
+5
-5
storage/myisam/mi_create.c
storage/myisam/mi_create.c
+1
-1
storage/myisam/mi_delete.c
storage/myisam/mi_delete.c
+1
-1
storage/myisam/mi_dynrec.c
storage/myisam/mi_dynrec.c
+2
-2
storage/myisam/mi_extra.c
storage/myisam/mi_extra.c
+2
-2
storage/myisam/mi_key.c
storage/myisam/mi_key.c
+1
-1
storage/myisam/mi_locking.c
storage/myisam/mi_locking.c
+1
-1
storage/myisam/mi_packrec.c
storage/myisam/mi_packrec.c
+1
-1
storage/myisam/mi_rfirst.c
storage/myisam/mi_rfirst.c
+1
-1
storage/myisam/mi_search.c
storage/myisam/mi_search.c
+1
-1
storage/myisam/mi_test_all.sh
storage/myisam/mi_test_all.sh
+2
-2
storage/myisam/myisamchk.c
storage/myisam/myisamchk.c
+1
-1
storage/myisam/myisamdef.h
storage/myisam/myisamdef.h
+1
-1
storage/myisam/myisamlog.c
storage/myisam/myisamlog.c
+1
-1
storage/myisam/myisampack.c
storage/myisam/myisampack.c
+2
-2
storage/myisam/sort.c
storage/myisam/sort.c
+1
-1
No files found.
storage/myisam/NEWS
View file @
38fa0141
...
...
@@ -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
automatic
al
ly 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 automatic
ly combine
adjacent deleted
update and insert. This is done by automatic
ally 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).
...
...
storage/myisam/ft_boolean_search.c
View file @
38fa0141
...
...
@@ -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 immediat
e
ly after the original word in ftbw->word
buffer.
ftbw->word= LENGTH WORD [ LENGTH1 WORD1 ] WEIGHT REFERENCE
...
...
storage/myisam/ha_myisam.cc
View file @
38fa0141
...
...
@@ -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
...
...
storage/myisam/mi_check.c
View file @
38fa0141
...
...
@@ -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 un
n
ecessary 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 effic
i
ent reads */
int
mi_sort_index
(
HA_CHECK
*
param
,
register
MI_INFO
*
info
,
char
*
name
)
{
...
...
@@ -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 happen
e
d 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 happen
e
d 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 cho
o
sen 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.
...
...
storage/myisam/mi_create.c
View file @
38fa0141
...
...
@@ -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 accident
al
ly destroy another table.
*/
create_flag
=
0
;
}
...
...
storage/myisam/mi_delete.c
View file @
38fa0141
...
...
@@ -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 ne
wer happend
*/
my_errno
=
HA_ERR_CRASHED
;
/* This should ne
ver happen
*/
goto
err
;
}
save_flag
=
0
;
...
...
storage/myisam/mi_dynrec.c
View file @
38fa0141
...
...
@@ -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 split
ed
which could
ca
su
e problems
the next block is so small it can't be split which could
ca
us
e problems
*/
MI_BLOCK_INFO
del_block
;
...
...
storage/myisam/mi_extra.c
View file @
38fa0141
...
...
@@ -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 agains
t
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
:
/* The
ese is
n't in use */
case
HA_EXTRA_NORMAL
:
/* The
se are
n't in use */
info
->
quick_mode
=
0
;
break
;
case
HA_EXTRA_QUICK
:
...
...
storage/myisam/mi_key.c
View file @
38fa0141
...
...
@@ -605,7 +605,7 @@ ulonglong retrieve_auto_increment(MI_INFO *info,const uchar *record)
}
/*
The following code works beca
su
e if s_value < 0 then value is 0
The following code works beca
us
e if s_value < 0 then value is 0
and if s_value == 0 then value will contain either s_value or the
correct value.
*/
...
...
storage/myisam/mi_locking.c
View file @
38fa0141
...
...
@@ -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 occur
r
ence of the table in the lock
structure.
*/
...
...
storage/myisam/mi_packrec.c
View file @
38fa0141
...
...
@@ -810,7 +810,7 @@ static void (*get_unpack_function(MI_COLUMNDEF *rec))
return
&
uf_varchar2
;
case
FIELD_LAST
:
default:
return
0
;
/* This should never happen
d
*/
return
0
;
/* This should never happen */
}
}
...
...
storage/myisam/mi_rfirst.c
View file @
38fa0141
...
...
@@ -16,7 +16,7 @@
#include "myisamdef.h"
/* Read first row through
a spec
fic key */
/* Read first row through
a speci
fic key */
int
mi_rfirst
(
MI_INFO
*
info
,
uchar
*
buf
,
int
inx
)
{
...
...
storage/myisam/mi_search.c
View file @
38fa0141
...
...
@@ -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 acces
s
the key any more ==> left= 0.
*/
left
=
((
len
<=
cmplen
)
?
suffix_len
:
((
prefix_len
<
cmplen
)
?
cmplen
-
prefix_len
:
0
));
...
...
storage/myisam/mi_test_all.sh
View file @
38fa0141
...
...
@@ -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 test
s on the MyISAM library to check if
#
things work
at all.
valgrind
=
"valgrind --alignment=8 --leak-check=yes"
silent
=
"-s"
...
...
storage/myisam/myisamchk.c
View file @
38fa0141
...
...
@@ -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 th
o
roughly. 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
\
...
...
storage/myisam/myisamdef.h
View file @
38fa0141
...
...
@@ -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
;
/* The
e
se 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 */
...
...
storage/myisam/myisamlog.c
View file @
38fa0141
...
...
@@ -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 accom
m
odate '<' 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.
...
...
storage/myisam/myisampack.c
View file @
38fa0141
...
...
@@ -108,7 +108,7 @@ typedef struct st_isam_mrg {
MI_INFO
**
file
,
**
current
,
**
end
;
uint
free_file
;
uint
count
;
uint
min_pack_length
;
/* The
ese is
used by packed data */
uint
min_pack_length
;
/* The
se 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. */
/* Reme
m
ber 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
+
...
...
storage/myisam/sort.c
View file @
38fa0141
...
...
@@ -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
*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment