Skip to content

Commit 717c12d

Browse files
qoboodsvoj
authored andcommitted
Fix typos in C comments inside sql/
1 parent 1537784 commit 717c12d

File tree

193 files changed

+746
-746
lines changed

Some content is hidden

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

193 files changed

+746
-746
lines changed

sql/authors.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ struct show_table_authors_st show_table_authors[]= {
5151
"Query Cache (4.0), Subqueries (4.1), Views (5.0)" },
5252
{ "Timour Katchaounov", "Sofia , Bulgaria", "Optimizer"},
5353
{ "Kristian Nielsen", "Copenhagen, Denmark",
54-
"Replication, Async client prototocol, General buildbot stuff" },
54+
"Replication, Async client protocol, General buildbot stuff" },
5555
{ "Alexander (Bar) Barkov", "Izhevsk, Russia",
5656
"Unicode and character sets" },
5757
{ "Alexey Botchkov (Holyfoot)", "Izhevsk, Russia",

sql/ddl_log.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,7 @@ static bool ddl_log_increment_phase_no_lock(uint entry_pos)
876876
else
877877
{
878878
/*
879-
Trying to deativate an execute entry or already deactive entry.
879+
Trying to deactivate an execute entry or already deactive entry.
880880
This should not happen
881881
*/
882882
DBUG_ASSERT(0);
@@ -1017,7 +1017,7 @@ static void ddl_log_to_binary_log(THD *thd, String *query)
10171017
table name to the query
10181018
10191019
When we log, we always log all found tables and views at the same time. This
1020-
is done to simply the exceute code as otherwise we would have to keep
1020+
is done to simply execute the code as otherwise we would have to keep
10211021
information of what was logged.
10221022
*/
10231023

@@ -1505,7 +1505,7 @@ static int ddl_log_execute_action(THD *thd, MEM_ROOT *mem_root,
15051505
case DDL_RENAME_PHASE_STAT:
15061506
/*
15071507
Stat tables must be updated last so that we can handle a rename of
1508-
a stat table. For now we just rememeber that we have to update it
1508+
a stat table. For now we just remember that we have to update it
15091509
*/
15101510
update_flags(ddl_log_entry->entry_pos, DDL_LOG_FLAG_UPDATE_STAT);
15111511
ddl_log_entry->flags|= DDL_LOG_FLAG_UPDATE_STAT;
@@ -2543,7 +2543,7 @@ bool ddl_log_write_entry(DDL_LOG_ENTRY *ddl_log_entry,
25432543
@brief Write or update execute entry in the ddl log.
25442544
25452545
@details An execute entry points to the first entry that should
2546-
be excuted during recovery. In some cases it's only written once,
2546+
be executed during recovery. In some cases it's only written once,
25472547
in other cases it's updated for each log entry to point to the new
25482548
header for the list.
25492549

sql/debug.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
functionality.
2424
*/
2525

26-
/* debug_crash_here() functionallity.
26+
/* debug_crash_here() functionality.
2727
See mysql_test/suite/atomic/create_table.test for an example of how it
2828
can be used
2929
*/

sql/derived_handler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class derived_handler
7373
*/
7474
virtual int next_row()= 0;
7575

76-
/* End prodicing rows */
76+
/* End producing rows */
7777
virtual int end_scan()=0;
7878

7979
/* Report errors */

sql/derror.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
@file
1919
2020
@brief
21-
Read language depeneded messagefile
21+
Read language depended messagefile
2222
*/
2323

2424
#include "mariadb.h"

sql/event_data_objects.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ Event_queue_element::load_from_row(THD *thd, TABLE *table)
519519
else
520520
expression= 0;
521521
/*
522-
If neigher STARTS and ENDS is set, then both fields are empty.
522+
If neither STARTS and ENDS is set, then both fields are empty.
523523
Hence, if ET_FIELD_EXECUTE_AT is empty there is an error.
524524
*/
525525
execute_at_null= table->field[ET_FIELD_EXECUTE_AT]->is_null();

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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ bool Field::marked_for_write_or_computed() const
8585
Rules for merging different types of fields in UNION
8686
8787
NOTE: to avoid 256*256 table, gap in table types numeration is skipped
88-
following #defines describe that gap and how to canculate number of fields
88+
following #defines describe that gap and how to calculate number of fields
8989
and index of field in this array.
9090
*/
9191
const int FIELDTYPE_TEAR_FROM= (MYSQL_TYPE_BIT + 1);
@@ -8573,7 +8573,7 @@ void Field_varstring::hash_not_null(Hasher *hasher)
85738573
@param[in] from data to compress
85748574
@param[in] length from length
85758575
@param[in] max_length truncate `from' to this length
8576-
@param[out] out_length compessed data length
8576+
@param[out] out_length compressed data length
85778577
@param[in] cs from character set
85788578
@param[in] nchars copy no more than "nchars" characters
85798579
@@ -9989,8 +9989,8 @@ Field_enum::can_optimize_range_or_keypart_ref(const Item_bool_func *cond,
99899989
3 - first (high) bit of 'c'
99909990
2 - second bit of 'c'
99919991
1 - third bit of 'c'
9992-
0 - forth bit of 'c'
9993-
2 7 - firth bit of 'c'
9992+
0 - fourth bit of 'c'
9993+
2 7 - fifth bit of 'c'
99949994
6 - null bit for 'd'
99959995
3 - 6 four bytes for 'a'
99969996
7 - 8 two bytes for 'b'

sql/field.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,7 +1045,7 @@ class Field: public Value_source
10451045
/**
10461046
Mark unused memory in the field as defined. Mainly used to ensure
10471047
that if we write full field to disk (for example in
1048-
Count_distinct_field::add(), we don't write unitalized data to
1048+
Count_distinct_field::add(), we don't write uninitialized data to
10491049
disk which would confuse valgrind or MSAN.
10501050
*/
10511051
virtual void mark_unused_memory_as_defined() {}
@@ -1786,7 +1786,7 @@ class Field: public Value_source
17861786
/*
17871787
Make a leaf tree when an INT value was stored into a field of INT type,
17881788
and some truncation happened. Tries to adjust the range search condition
1789-
when possible, e.g. "tinytint < 300" -> "tinyint <= 127".
1789+
when possible, e.g. "tinyint < 300" -> "tinyint <= 127".
17901790
Can also return SEL_ARG_IMPOSSIBLE(), and NULL (not sargable).
17911791
*/
17921792
SEL_ARG *stored_field_make_mm_leaf_bounded_int(RANGE_OPT_PARAM *param,

sql/filesort.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ SORT_INFO *filesort(THD *thd, TABLE *table, Filesort *filesort,
339339
if (costs.fastest_sort == PQ_SORT_ALL_FIELDS ||
340340
costs.fastest_sort == PQ_SORT_ORDER_BY_FIELDS)
341341
{
342-
/* We are going to use priorty queue */
342+
/* We are going to use priority queue */
343343
thd->query_plan_flags|= QPLAN_FILESORT_PRIORITY_QUEUE;
344344
status_var_increment(thd->status_var.filesort_pq_sorts_);
345345
tracker->incr_pq_used();
@@ -359,7 +359,7 @@ SORT_INFO *filesort(THD *thd, TABLE *table, Filesort *filesort,
359359
param.res_length= param.ref_length;
360360
/*
361361
Add the ref (rowid which is stored last in the sort key) to the sort,
362-
as we want to retrive rows in id order, if possible.
362+
as we want to retrieve rows in id order, if possible.
363363
*/
364364
param.sort_length+= param.ref_length;
365365
param.rec_length= param.sort_length;

0 commit comments

Comments
 (0)