Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion man/mysqldump.1
Original file line number Diff line number Diff line change
Expand Up @@ -1261,7 +1261,7 @@ to point the slave to the correct master server host\&. Add any such parameters
.\" max-allowed-packet option: mysqldump
\fB\-\-max\-allowed\-packet=\fR\fB\fIlength\fR\fR
.sp
Sets the maximum packet length to send to or recieve from server\&.
Sets the maximum packet length to send to or receive from server\&.
.RE
.sp
.RS 4
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/lib/v1/ndb_config_1_node.ini
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory

#
# Increase timeouts to cater for slow test-machines
# (possibly running several tests in parallell)
# (possibly running several tests in parallel)
#
HeartbeatIntervalDbDb= 30000
HeartbeatIntervalDbApi= 30000
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/lib/v1/ndb_config_2_node.ini
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ InitialNoOfOpenFiles= 27

#
# Increase timeouts to cater for slow test-machines
# (possibly running several tests in parallell)
# (possibly running several tests in parallel)
#
HeartbeatIntervalDbDb= 30000
HeartbeatIntervalDbApi= 30000
Expand Down
12 changes: 6 additions & 6 deletions mysql-test/mysql-test-run.pl
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@ ($$$)
redo;
}

# Limit number of parallell NDB tests
# Limit number of parallel NDB tests
if ($t->{ndb_test} and $num_ndb_tests >= $max_ndb){
#mtr_report("Skipping, num ndb is already at max, $num_ndb_tests");
next;
Expand Down Expand Up @@ -6347,10 +6347,10 @@ ($)
non-blocking-api Use the non-blocking client API
compress Use the compressed protocol between client and server
ssl Use ssl protocol between client and server
skip-ssl Dont start server with support for ssl connections
skip-ssl Don't start server with support for ssl connections
vs-config Visual Studio configuration used to create executables
(default: MTR_VS_CONFIG environment variable)
parallel=# How many parallell test should be run
parallel=# How many parallel test should be run
defaults-file=<config template> Use fixed config template for all
tests
defaults-extra-file=<config template> Extra config template to add to
Expand Down Expand Up @@ -6477,7 +6477,7 @@ ($)
up disks for heavily crashing server). Defaults to
$opt_max_save_datadir, set to 0 for no limit. Set
it's default with MTR_MAX_SAVE_DATADIR
max-test-fail Limit the number of test failurs before aborting
max-test-fail Limit the number of test failures before aborting
the current test run. Defaults to
$opt_max_test_fail, set to 0 for no limit. Set
it's default with MTR_MAX_TEST_FAIL
Expand Down Expand Up @@ -6524,7 +6524,7 @@ ($)
--mysqld (if any)
wait-all If --start or --start-dirty option is used, wait for all
servers to exit before finishing the process
fast Run as fast as possible, dont't wait for servers
fast Run as fast as possible, don't wait for servers
to shutdown etc.
force-restart Always restart servers between tests
parallel=N Run tests in N parallel threads (default 1)
Expand Down Expand Up @@ -6559,7 +6559,7 @@ ($)
actions. Disable facility with NUM=0.
gcov Collect coverage information after the test.
The result is a gcov file per source and header file.
gcov-src-dir=subdir Colllect coverage only within the given subdirectory.
gcov-src-dir=subdir Collect coverage only within the given subdirectory.
For example, if you're only developing the SQL layer,
it makes sense to use --gcov-src-dir=sql
gprof Collect profiling information using gprof.
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/std_data/ndb_config_config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ InitialNoOfOpenFiles= 27

#
# Increase timeouts to cater for slow test-machines
# (possibly running several tests in parallell)
# (possibly running several tests in parallel)
#
HeartbeatIntervalDbDb= 30000
HeartbeatIntervalDbApi= 30000
Expand Down
2 changes: 1 addition & 1 deletion sql/log.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3075,7 +3075,7 @@ bool MYSQL_BIN_LOG::open(const char *log_name,
it may be good to consider what actually happens when
open_purge_index_file succeeds but register or sync fails.

Perhaps we might need the code below in MYSQL_LOG_BIN::cleanup
Perhaps we might need the code below in MYSQL_BIN_LOG::cleanup
for "real life" purposes as well?
*/
DBUG_EXECUTE_IF("fault_injection_registering_index", {
Expand Down
2 changes: 1 addition & 1 deletion sql/rpl_rli.h
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ class Relay_log_info : public Slave_reporting_capability
/**
Save pointer to Annotate_rows event and switch on the
binlog_annotate_row_events for this sql thread.
To be called when sql thread recieves an Annotate_rows event.
To be called when sql thread receives an Annotate_rows event.
*/
inline void set_annotate_event(Annotate_rows_log_event *event)
{
Expand Down
2 changes: 1 addition & 1 deletion sql/scheduler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ void one_thread_per_connection_scheduler(scheduler_functions *func,
#endif

/*
Initailize scheduler for --thread-handling=no-threads
Initialize scheduler for --thread-handling=no-threads
*/

void one_thread_scheduler(scheduler_functions *func)
Expand Down
1 change: 1 addition & 0 deletions sql/sql_show.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2286,6 +2286,7 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
DBUG_VOID_RETURN;
}


int fill_schema_processlist(THD* thd, TABLE_LIST* tables, COND* cond)
{
TABLE *table= tables->table;
Expand Down
2 changes: 1 addition & 1 deletion storage/innobase/dict/dict0load.c
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ dict_process_sys_foreign_rec(
return("incorrect column length in SYS_FOREIGN");
}

/* This recieves a dict_foreign_t* that points to a stack variable.
/* This receives a dict_foreign_t* that points to a stack variable.
So mem_heap_free(foreign->heap) is not used as elsewhere.
Since the heap used here is freed elsewhere, foreign->heap
is not assigned. */
Expand Down
2 changes: 1 addition & 1 deletion storage/innobase/trx/trx0undo.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ we trigger the start of a purge? When a transaction writes to an undo log,
it may notice that the space is running out. When a read view is closed,
it may make some history superfluous. The server can have an utility which
periodically checks if it can purge some history.
In a parallellized purge we have the problem that a query thread
In a parallelized purge we have the problem that a query thread
can remove a delete marked clustered index record before another query
thread has processed an earlier version of the record, which cannot then
be done because the row cannot be constructed from the clustered index
Expand Down
2 changes: 1 addition & 1 deletion storage/maria/maria_chk.c
Original file line number Diff line number Diff line change
Expand Up @@ -1021,7 +1021,7 @@ static int maria_chk(HA_CHECK *param, char *filename)
error= 1;
goto end2;
}
/* We can't do parallell repair with BLOCK_RECORD yet */
/* We can't do parallel repair with BLOCK_RECORD yet */
if (param->testflag & T_REP_PARALLEL)
{
param->testflag&= ~T_REP_PARALLEL;
Expand Down
2 changes: 1 addition & 1 deletion storage/ndb/include/ndbapi/NdbEventOperation.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class NdbEventOperationImpl;
* - Event code does not check table schema version. Make sure to drop events
* after table is dropped. Will be fixed in later
* versions.
* - If a node failure has occured not all events will be recieved
* - If a node failure has occured not all events will be received
* anymore. Drop NdbEventOperation and Create again after nodes are up
* again. Will be fixed in later versions.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ public void ConnectCallback( IAsyncResult ar )
if ( sock1.Connected )
{
// Define a new Callback to read the data
AsyncCallback recieveData = new AsyncCallback( OnRecievedData );
AsyncCallback receiveData = new AsyncCallback( OnRecievedData );
// Begin reading data asyncronously
sock1.BeginReceive( m_byBuff, 0, m_byBuff.Length, SocketFlags.None, recieveData , sock1 );
sock1.BeginReceive( m_byBuff, 0, m_byBuff.Length, SocketFlags.None, receiveData , sock1 );
}
}
catch( Exception ex )
Expand Down Expand Up @@ -163,7 +163,7 @@ public void OnRecievedData( IAsyncResult ar )
}
else
{
// If no data was recieved then the connection is probably dead
// If no data was received then the connection is probably dead
Console.WriteLine( "Disconnected", sock.RemoteEndPoint );
sock.Shutdown( SocketShutdown.Both );
sock.Close();
Expand Down
2 changes: 1 addition & 1 deletion storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10559,7 +10559,7 @@ void Dbtc::releaseAbortResources(Signal* signal)

// MASV let state be CS_ABORTING until all
// signals in the "air" have been received. Reset to CS_CONNECTED
// will be done when a TCKEYREQ with start flag is recieved
// will be done when a TCKEYREQ with start flag is received
// or releaseApiCon is called
// apiConnectptr.p->apiConnectstate = CS_CONNECTED;
apiConnectptr.p->apiConnectstate = CS_ABORTING;
Expand Down
6 changes: 3 additions & 3 deletions storage/ndb/src/mgmsrv/MgmtSrvr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ class MgmtSrvr {
// we signal with a condition variable to the waiting
// thread (receiveOptimisedResponse) that the signal has arrived.
// Parameters:
// signal: The recieved signal
// signal: The received signal
// Returns: -
//**************************************************************************

Expand Down Expand Up @@ -566,7 +566,7 @@ class MgmtSrvr {
/**
* This function is called from "outside" of MgmtSrvr
* when a signal is sent to MgmtSrvr.
* @param mgmtSrvr: The MgmtSrvr object which shall recieve the signal.
* @param mgmtSrvr: The MgmtSrvr object which shall receive the signal.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it should be "should" instead of "shall" here. Otherwise it looks good! 👍

* @param signal: The received signal.
*/
static void signalReceivedNotification(void* mgmtSrvr,
Expand Down Expand Up @@ -600,7 +600,7 @@ class MgmtSrvr {

Uint32 theWaitNode;
WaitSignalType theWaitState;
// State denoting a set of signals we accept to recieve.
// State denoting a set of signals we accept to receive.

NdbCondition* theMgmtWaitForResponseCondPtr;
// Condition variable used when we wait for a signal to arrive/a
Expand Down
2 changes: 1 addition & 1 deletion storage/ndb/test/ndbapi/testDict.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -942,7 +942,7 @@ int runStoreFrm(NDBT_Context* ctx, NDBT_Step* step){

// Verfiy the frm data
if (memcmp(pData, pData2, resultLen) != 0){
g_err << "Wrong data recieved" << endl;
g_err << "Wrong data received" << endl;
for (size_t i = 0; i < dataLen; i++){
unsigned char c = ((unsigned char*)pData2)[i];
g_err << hex << c << ", ";
Expand Down
2 changes: 1 addition & 1 deletion storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1611,7 +1611,7 @@ Function: AggretateFn():
<char* szTableName> - name of the table
<int nCol> - number of the column
<double* pdIn> - pointer to double containing the value to be used in a call to COUNT; used only by this function
<double* pdOut> - pointer to double that will recieve the result
<double* pdOut> - pointer to double that will receive the result
<attr_type attrType> - type of the attribute
*************************************************/
SQLRETURN AggregateFn(aggr_fn fn, char* szTableName, int nCol, double* pdIn, double* pdOut, attr_type attrType){
Expand Down
2 changes: 1 addition & 1 deletion storage/tokudb/ft-index/ft/ft-flusher.cc
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ handle_split_of_child(

// We never set the rightmost blocknum to be the root.
// Instead, we wait for the root to split and let promotion initialize the rightmost
// blocknum to be the first non-root leaf node on the right extreme to recieve an insert.
// blocknum to be the first non-root leaf node on the right extreme to receive an insert.
BLOCKNUM rightmost_blocknum = toku_drd_unsafe_fetch(&ft->rightmost_blocknum);
invariant(ft->h->root_blocknum.b != rightmost_blocknum.b);
if (childa->blocknum.b == rightmost_blocknum.b) {
Expand Down
4 changes: 2 additions & 2 deletions storage/xtradb/dict/dict0load.c
Original file line number Diff line number Diff line change
Expand Up @@ -481,8 +481,8 @@ dict_process_sys_foreign_rec(
err_len:
return("incorrect column length in SYS_FOREIGN");
}
/* This recieves a dict_foreign_t* that points to a stack variable.

/* This receives a dict_foreign_t* that points to a stack variable.
So mem_heap_free(foreign->heap) is not used as elsewhere.
Since the heap used here is freed elsewhere, foreign->heap
is not assigned. */
Expand Down
2 changes: 1 addition & 1 deletion storage/xtradb/trx/trx0undo.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ we trigger the start of a purge? When a transaction writes to an undo log,
it may notice that the space is running out. When a read view is closed,
it may make some history superfluous. The server can have an utility which
periodically checks if it can purge some history.
In a parallellized purge we have the problem that a query thread
In a parallelized purge we have the problem that a query thread
can remove a delete marked clustered index record before another query
thread has processed an earlier version of the record, which cannot then
be done because the row cannot be constructed from the clustered index
Expand Down