Skip to content

Commit 882f6fa

Browse files
committed
Fixed typos
- Removed duplicate words, like "the the" and "to to" - Removed duplicate lines (one double sort line found in mysql.cc) - Fixed some typos found while searching for duplicate words. Command used to find duplicate words: egrep -rI "\s([a-zA-Z]+)\s+\1\s" | grep -v param Thanks to Artjoms Rimdjonoks for the command and pointing out the spelling errors.
1 parent 2507753 commit 882f6fa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+169
-172
lines changed

mysql-test/main/mysqld--help.result

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1495,9 +1495,8 @@ The following specify which files/extra groups are read (specified before remain
14951495
--thread-pool-priority=name
14961496
Threadpool priority. High priority connections usually
14971497
start executing earlier than low priority.If priority set
1498-
to 'auto', the the actual priority(low or high) is
1499-
determined based on whether or not connection is inside
1500-
transaction.
1498+
to 'auto', the actual priority(low or high) is determined
1499+
based on whether or not connection is inside transaction.
15011500
--thread-pool-size=#
15021501
Number of thread groups in the pool. This parameter is
15031502
roughly equivalent to maximum number of concurrently

mysql-test/suite/sys_vars/r/sysvars_server_embedded.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,7 @@ COMMAND_LINE_ARGUMENT REQUIRED
10151015
VARIABLE_NAME FOREIGN_KEY_CHECKS
10161016
VARIABLE_SCOPE SESSION
10171017
VARIABLE_TYPE BOOLEAN
1018-
VARIABLE_COMMENT If set to 1 (the default) foreign key constraints (including ON UPDATE and ON DELETE behavior) InnoDB tables are checked, while if set to 0, they are not checked. 0 is not recommended for normal use, though it can be useful in situations where you know the data is consistent, but want to reload data in a different order from that that specified by parent/child relationships. Setting this variable to 1 does not retrospectively check for inconsistencies introduced while set to 0.
1018+
VARIABLE_COMMENT If set to 1 (the default) foreign key constraints (including ON UPDATE and ON DELETE behavior) InnoDB tables are checked, while if set to 0, they are not checked. 0 is not recommended for normal use, though it can be useful in situations where you know the data is consistent, but want to reload data in a different order from that specified by parent/child relationships. Setting this variable to 1 does not retrospectively check for inconsistencies introduced while set to 0.
10191019
NUMERIC_MIN_VALUE NULL
10201020
NUMERIC_MAX_VALUE NULL
10211021
NUMERIC_BLOCK_SIZE NULL

mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,7 +1045,7 @@ COMMAND_LINE_ARGUMENT REQUIRED
10451045
VARIABLE_NAME FOREIGN_KEY_CHECKS
10461046
VARIABLE_SCOPE SESSION
10471047
VARIABLE_TYPE BOOLEAN
1048-
VARIABLE_COMMENT If set to 1 (the default) foreign key constraints (including ON UPDATE and ON DELETE behavior) InnoDB tables are checked, while if set to 0, they are not checked. 0 is not recommended for normal use, though it can be useful in situations where you know the data is consistent, but want to reload data in a different order from that that specified by parent/child relationships. Setting this variable to 1 does not retrospectively check for inconsistencies introduced while set to 0.
1048+
VARIABLE_COMMENT If set to 1 (the default) foreign key constraints (including ON UPDATE and ON DELETE behavior) InnoDB tables are checked, while if set to 0, they are not checked. 0 is not recommended for normal use, though it can be useful in situations where you know the data is consistent, but want to reload data in a different order from that specified by parent/child relationships. Setting this variable to 1 does not retrospectively check for inconsistencies introduced while set to 0.
10491049
NUMERIC_MIN_VALUE NULL
10501050
NUMERIC_MAX_VALUE NULL
10511051
NUMERIC_BLOCK_SIZE NULL
@@ -4505,7 +4505,7 @@ COMMAND_LINE_ARGUMENT REQUIRED
45054505
VARIABLE_NAME THREAD_POOL_PRIORITY
45064506
VARIABLE_SCOPE SESSION
45074507
VARIABLE_TYPE ENUM
4508-
VARIABLE_COMMENT Threadpool priority. High priority connections usually start executing earlier than low priority.If priority set to 'auto', the the actual priority(low or high) is determined based on whether or not connection is inside transaction.
4508+
VARIABLE_COMMENT Threadpool priority. High priority connections usually start executing earlier than low priority.If priority set to 'auto', the actual priority(low or high) is determined based on whether or not connection is inside transaction.
45094509
NUMERIC_MIN_VALUE NULL
45104510
NUMERIC_MAX_VALUE NULL
45114511
NUMERIC_BLOCK_SIZE NULL

sql/ddl_log.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2029,7 +2029,7 @@ static int ddl_log_execute_action(THD *thd, MEM_ROOT *mem_root,
20292029
{
20302030
LEX_CUSTRING version= {ddl_log_entry->uuid, MY_UUID_SIZE};
20312031
/*
2032-
Temporary .frm file exists. This means that that the table in
2032+
Temporary .frm file exists. This means that the table in
20332033
the storage engine can be of either old or new version.
20342034
If old version, delete the new .frm table and keep the old one.
20352035
If new version, replace the old .frm with the new one.

sql/debug_sync.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ struct st_debug_sync_control
7474

7575
/**
7676
Definitions for the debug sync facility.
77-
1. Global string variable to hold a set of of "signals".
77+
1. Global string variable to hold a set of "signals".
7878
2. Global condition variable for signaling and waiting.
7979
3. Global mutex to synchronize access to the above.
8080
*/
@@ -1009,7 +1009,7 @@ static bool debug_sync_set_action(THD *thd, st_debug_sync_action *action)
10091009
If the terminator of the token is ASCII NUL ('\0'), it returns a
10101010
pointer to the terminator (string end).
10111011
1012-
If the terminator is a space character, it replaces the the first
1012+
If the terminator is a space character, it replaces the first
10131013
byte of the terminator character by ASCII NUL ('\0'), skips the (now
10141014
corrupted) terminator character, and skips all following space
10151015
characters. It returns a pointer to the next non-space character or

sql/event_scheduler.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ deinit_event_thread(THD *thd)
167167
thd The THD of the thread. Has to be allocated by the caller.
168168
169169
NOTES
170-
1. The host of the thead is my_localhost
170+
1. The host of the thread is my_localhost
171171
2. thd->net is initted with NULL - no communication.
172172
*/
173173

sql/field.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,7 +1143,7 @@ Field_longstr::pack_sort_string(uchar *to, const SORT_FIELD_ATTR *sort_field)
11431143
@details
11441144
The function returns a double number between 0.0 and 1.0 as the relative
11451145
position of the value of the this field in the numeric interval of [min,max].
1146-
If the value is not in the interval the the function returns 0.0 when
1146+
If the value is not in the interval the function returns 0.0 when
11471147
the value is less than min, and, 1.0 when the value is greater than max.
11481148
11491149
@param min value of the left end of the interval
@@ -1204,7 +1204,7 @@ static inline double safe_substract(ulonglong a, ulonglong b)
12041204
@details
12051205
The function returns a double number between 0.0 and 1.0 as the relative
12061206
position of the value of the this field in the string interval of [min,max].
1207-
If the value is not in the interval the the function returns 0.0 when
1207+
If the value is not in the interval the function returns 0.0 when
12081208
the value is less than min, and, 1.0 when the value is greater than max.
12091209
12101210
@note

sql/filesort.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2420,7 +2420,7 @@ get_addon_fields(TABLE *table, uint sortlength,
24202420

24212421
/*
24222422
If there is a reference to a field in the query add it
2423-
to the the set of appended fields.
2423+
to the set of appended fields.
24242424
Note for future refinement:
24252425
This this a too strong condition.
24262426
Actually we need only the fields referred in the

sql/ha_partition.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ partition_notify_tabledef_changed(handlerton *,
149149

150150

151151
/*
152-
If frm_error() is called then we will use this to to find out what file
152+
If frm_error() is called then we will use this to find out what file
153153
extensions exist for the storage engine. This is also used by the default
154154
rename_table and delete_table method in handler.cc.
155155
*/
@@ -9791,7 +9791,7 @@ ha_rows ha_partition::min_rows_for_estimate()
97919791
All partitions might have been left as unused during partition pruning
97929792
due to, for example, an impossible WHERE condition. Nonetheless, the
97939793
optimizer might still attempt to perform (e.g. range) analysis where an
9794-
estimate of the the number of rows is calculated using records_in_range.
9794+
estimate of the number of rows is calculated using records_in_range.
97959795
Hence, to handle this and other possible cases, use zero as the minimum
97969796
number of rows to base the estimate on if no partition is being used.
97979797
*/

sql/ha_partition.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ typedef struct st_partition_part_key_multi_range_hld
271271
/* Owner object */
272272
ha_partition *partition;
273273

274-
/* id of the the partition this structure is for */
274+
/* id of the partition this structure is for */
275275
uint32 part_id;
276276

277277
/* Current range we're iterating through */

0 commit comments

Comments
 (0)