Skip to content

Commit 1777fd5

Browse files
committed
Fix spelling: occurred, execute, which etc
1 parent f825191 commit 1777fd5

File tree

126 files changed

+200
-200
lines changed

Some content is hidden

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

126 files changed

+200
-200
lines changed

Docs/sp-imp-spec.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@
243243
in the caller's frame is set in the new context as well.
244244
4) For each instruction, call its execute() method.
245245
The result is a pointer to the next instruction to execute (or NULL)
246-
if an error occured.
246+
if an error occurred.
247247
5) On success, set the new values of the OUT and INOUT parameters in
248248
the caller's frame.
249249

@@ -853,7 +853,7 @@
853853
// '*nextp' will be set to the index of the next instruction
854854
// to execute. (For most instruction this will be the
855855
// instruction following this one.)
856-
// Returns 0 on success, non-zero if some error occured.
856+
// Returns 0 on success, non-zero if some error occurred.
857857
virtual int execute(THD *, uint *nextp)
858858
}
859859

client/mysql.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3358,7 +3358,7 @@ com_go(String *buffer,char *line __attribute__((unused)))
33583358

33593359
end:
33603360

3361-
/* Show warnings if any or error occured */
3361+
/* Show warnings if any or error occurred */
33623362
if (show_warnings == 1 && (warnings >= 1 || error))
33633363
print_warnings();
33643364

client/mysql_upgrade.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ static int get_upgrade_info_file_name(char* name)
644644
/*
645645
Read the content of mysql_upgrade_info file and
646646
compare the version number form file against
647-
version number wich mysql_upgrade was compiled for
647+
version number which mysql_upgrade was compiled for
648648
649649
NOTE
650650
This is an optimization to avoid running mysql_upgrade

client/mysqltest.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,7 +1104,7 @@ void do_eval(DYNAMIC_STRING *query_eval, const char *query,
11041104
Run query and dump the result to stderr in vertical format
11051105
11061106
NOTE! This function should be safe to call when an error
1107-
has occured and thus any further errors will be ignored(although logged)
1107+
has occurred and thus any further errors will be ignored (although logged)
11081108
11091109
SYNOPSIS
11101110
show_query
@@ -1170,7 +1170,7 @@ static void show_query(MYSQL* mysql, const char* query)
11701170
is added to the warning stack, only print @@warning_count-1 warnings.
11711171
11721172
NOTE! This function should be safe to call when an error
1173-
has occured and this any further errors will be ignored(although logged)
1173+
has occurred and this any further errors will be ignored(although logged)
11741174
11751175
SYNOPSIS
11761176
show_warnings_before_error
@@ -4701,7 +4701,7 @@ void do_sync_with_master2(struct st_command *command, long offset,
47014701
master_pos_wait returned NULL. This indicates that
47024702
slave SQL thread is not started, the slave's master
47034703
information is not initialized, the arguments are
4704-
incorrect, or an error has occured
4704+
incorrect, or an error has occurred
47054705
*/
47064706
die("%.*s failed: '%s' returned NULL " \
47074707
"indicating slave SQL thread failure",

debian/additions/innotop/innotop

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1503,7 +1503,7 @@ my %exprs = (
15031503

15041504
my %columns = (
15051505
active_secs => { hdr => 'SecsActive', num => 1, label => 'Seconds transaction has been active', },
1506-
add_pool_alloc => { hdr => 'Add\'l Pool', num => 1, label => 'Additonal pool allocated' },
1506+
add_pool_alloc => { hdr => 'Add\'l Pool', num => 1, label => 'Additional pool allocated' },
15071507
attempted_op => { hdr => 'Action', num => 0, label => 'The action that caused the error' },
15081508
awe_mem_alloc => { hdr => 'AWE Memory', num => 1, label => '[Windows] AWE memory allocated' },
15091509
binlog_cache_overflow => { hdr => 'Binlog Cache', num => 1, label => 'Transactions too big for binlog cache that went to disk' },
@@ -10365,7 +10365,7 @@ show you something like this:
1036510365
pages_modified Dirty Pages Pages modified (dirty IB_bp_pages_m
1036610366
buf_pool_hit_rate Hit Rate Buffer pool hit rate IB_bp_buf_poo
1036710367
total_mem_alloc Memory Total memory allocate IB_bp_total_m
10368-
add_pool_alloc Add'l Pool Additonal pool alloca IB_bp_add_poo
10368+
add_pool_alloc Add'l Pool Additional pool alloca IB_bp_add_poo
1036910369
1037010370
The first line shows which table you're editing, and reminds you again to press
1037110371
'?' for a list of key mappings. The rest is a tabular representation of the

debian/additions/innotop/innotop.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1579,7 +1579,7 @@ show you something like this:
15791579
\& pages_modified Dirty Pages Pages modified (dirty IB_bp_pages_m
15801580
\& buf_pool_hit_rate Hit Rate Buffer pool hit rate IB_bp_buf_poo
15811581
\& total_mem_alloc Memory Total memory allocate IB_bp_total_m
1582-
\& add_pool_alloc Add\*(Aql Pool Additonal pool alloca IB_bp_add_poo
1582+
\& add_pool_alloc Add\*(Aql Pool Additional pool alloca IB_bp_add_poo
15831583
.Ve
15841584
.PP
15851585
The first line shows which table you're editing, and reminds you again to press

debian/additions/mysqlreport

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ sub read_relative_infiles
350350

351351
# The infile must begin with the system variable values.
352352
# Therefore, the first occurance of Aborted_clients indicates the beginning
353-
# of the first set of status values if no sets have occured yet ($stat_n == 0).
353+
# of the first set of status values if no sets have occurred yet ($stat_n == 0).
354354
# In this case, the following status values are printed to the current fh,
355355
# along with the system variable values read thus far, until Aborted_clients
356356
# occurs again. Then begins the second and subsequent sets of status values.

extra/yassl/src/yassl_error.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ void SetErrorString(YasslError error, char* buffer)
121121
break;
122122

123123
case certificate_error :
124-
strncpy(buffer, "unable to proccess cerificate", max);
124+
strncpy(buffer, "unable to process cerificate", max);
125125
break;
126126

127127
case privateKey_error :
128-
strncpy(buffer, "unable to proccess private key, bad format", max);
128+
strncpy(buffer, "unable to process private key, bad format", max);
129129
break;
130130

131131
case badVersion_error :

include/my_context.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ struct mysql_async_context {
178178
resumed, eg. whether we woke up due to connection completed or timeout
179179
in mysql_real_connect_cont().
180180
*/
181-
unsigned int events_occured;
181+
unsigned int events_occurred;
182182
/*
183183
This is set to the result of the whole asynchronous operation when it
184184
completes. It uses a union, as different calls have different return

libmysql/libmysql.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2232,7 +2232,7 @@ static int stmt_read_row_buffered(MYSQL_STMT *stmt, unsigned char **row)
22322232

22332233
/*
22342234
Read one row from network: unbuffered non-cursor fetch.
2235-
If last row was read, or error occured, erase this statement
2235+
If last row was read, or error occurred, erase this statement
22362236
from record pointing to object unbuffered fetch is performed from.
22372237
22382238
SYNOPSIS

0 commit comments

Comments
 (0)