diff --git a/man/mysqldump.1 b/man/mysqldump.1 index fdca51f091aab..a12b9ff166956 100644 --- a/man/mysqldump.1 +++ b/man/mysqldump.1 @@ -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 diff --git a/mysql-test/lib/v1/ndb_config_1_node.ini b/mysql-test/lib/v1/ndb_config_1_node.ini index 4e0be7796dce0..0e767fea80a66 100644 --- a/mysql-test/lib/v1/ndb_config_1_node.ini +++ b/mysql-test/lib/v1/ndb_config_1_node.ini @@ -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 diff --git a/mysql-test/lib/v1/ndb_config_2_node.ini b/mysql-test/lib/v1/ndb_config_2_node.ini index 57e4d049ad677..f30927b0cd4c9 100644 --- a/mysql-test/lib/v1/ndb_config_2_node.ini +++ b/mysql-test/lib/v1/ndb_config_2_node.ini @@ -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 diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 566423a1c07cf..5c5393400d8ba 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -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; @@ -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= Use fixed config template for all tests defaults-extra-file= Extra config template to add to @@ -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 @@ -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) @@ -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. diff --git a/mysql-test/std_data/ndb_config_config.ini b/mysql-test/std_data/ndb_config_config.ini index c325952d322bf..a7496833a6b9e 100644 --- a/mysql-test/std_data/ndb_config_config.ini +++ b/mysql-test/std_data/ndb_config_config.ini @@ -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 diff --git a/sql/log.cc b/sql/log.cc index 9722f20869da7..9e54a758aacd3 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -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", { diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h index b989283deb432..ac1c31c932196 100644 --- a/sql/rpl_rli.h +++ b/sql/rpl_rli.h @@ -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) { diff --git a/sql/scheduler.cc b/sql/scheduler.cc index 1cdda089a6bfd..485f2ef9d42f5 100644 --- a/sql/scheduler.cc +++ b/sql/scheduler.cc @@ -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) diff --git a/sql/sql_show.cc b/sql/sql_show.cc index f6ed5702ce552..d954a223a8113 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -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; diff --git a/storage/innobase/dict/dict0load.c b/storage/innobase/dict/dict0load.c index 22de23af7ee20..f46bcd4fe41ef 100644 --- a/storage/innobase/dict/dict0load.c +++ b/storage/innobase/dict/dict0load.c @@ -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. */ diff --git a/storage/innobase/trx/trx0undo.c b/storage/innobase/trx/trx0undo.c index 3d794c69c8b6d..69da5ca6d9866 100644 --- a/storage/innobase/trx/trx0undo.c +++ b/storage/innobase/trx/trx0undo.c @@ -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 diff --git a/storage/maria/maria_chk.c b/storage/maria/maria_chk.c index cfc8a604118ba..3b1fd81abf0ca 100644 --- a/storage/maria/maria_chk.c +++ b/storage/maria/maria_chk.c @@ -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; diff --git a/storage/ndb/include/ndbapi/NdbEventOperation.hpp b/storage/ndb/include/ndbapi/NdbEventOperation.hpp index 5f41f30a38b4b..c58e258b60a95 100644 --- a/storage/ndb/include/ndbapi/NdbEventOperation.hpp +++ b/storage/ndb/include/ndbapi/NdbEventOperation.hpp @@ -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. * diff --git a/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs b/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs index fda0fc937e113..66eb126effc26 100644 --- a/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs +++ b/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs @@ -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 ) @@ -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(); diff --git a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp index f4b0e07854c57..55608deb53c6e 100644 --- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp +++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp @@ -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; diff --git a/storage/ndb/src/mgmsrv/MgmtSrvr.hpp b/storage/ndb/src/mgmsrv/MgmtSrvr.hpp index 255a3e962ea98..11aa69deee4db 100644 --- a/storage/ndb/src/mgmsrv/MgmtSrvr.hpp +++ b/storage/ndb/src/mgmsrv/MgmtSrvr.hpp @@ -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: - //************************************************************************** @@ -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. * @param signal: The received signal. */ static void signalReceivedNotification(void* mgmtSrvr, @@ -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 diff --git a/storage/ndb/test/ndbapi/testDict.cpp b/storage/ndb/test/ndbapi/testDict.cpp index 88e94239ea8e2..02581d17fb44b 100644 --- a/storage/ndb/test/ndbapi/testDict.cpp +++ b/storage/ndb/test/ndbapi/testDict.cpp @@ -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 << ", "; diff --git a/storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp b/storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp index 6144165a976c2..49f8749166dfd 100644 --- a/storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp +++ b/storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp @@ -1611,7 +1611,7 @@ Function: AggretateFn(): - name of the table - number of the column - pointer to double containing the value to be used in a call to COUNT; used only by this function - - pointer to double that will recieve the result + - pointer to double that will receive the result - type of the attribute *************************************************/ SQLRETURN AggregateFn(aggr_fn fn, char* szTableName, int nCol, double* pdIn, double* pdOut, attr_type attrType){ diff --git a/storage/tokudb/ft-index/ft/ft-flusher.cc b/storage/tokudb/ft-index/ft/ft-flusher.cc index a39092aa05847..f315ef65728c2 100644 --- a/storage/tokudb/ft-index/ft/ft-flusher.cc +++ b/storage/tokudb/ft-index/ft/ft-flusher.cc @@ -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) { diff --git a/storage/xtradb/dict/dict0load.c b/storage/xtradb/dict/dict0load.c index 1fdbffee3c8eb..edfc3802341d8 100644 --- a/storage/xtradb/dict/dict0load.c +++ b/storage/xtradb/dict/dict0load.c @@ -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. */ diff --git a/storage/xtradb/trx/trx0undo.c b/storage/xtradb/trx/trx0undo.c index 3d794c69c8b6d..69da5ca6d9866 100644 --- a/storage/xtradb/trx/trx0undo.c +++ b/storage/xtradb/trx/trx0undo.c @@ -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