From a46d43347011cca3ed62540261ba63cb42909471 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 12 Mar 2015 07:17:16 +1100 Subject: [PATCH 1/4] Correct comments before mysql_socket_{g|s}etfd to refer to the right function --- include/mysql/psi/mysql_socket.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/mysql/psi/mysql_socket.h b/include/mysql/psi/mysql_socket.h index e1d56539f853c..1573fe77a9a5d 100644 --- a/include/mysql/psi/mysql_socket.h +++ b/include/mysql/psi/mysql_socket.h @@ -149,7 +149,7 @@ MYSQL_SOCKET socket __attribute__ ((unused)) /** MYSQL_SOCKET helper. Get socket descriptor. @param mysql_socket Instrumented socket - @sa mysql_socket_setfd + @sa mysql_socket_getfd */ static inline my_socket mysql_socket_getfd(MYSQL_SOCKET mysql_socket) @@ -161,7 +161,7 @@ mysql_socket_getfd(MYSQL_SOCKET mysql_socket) MYSQL_SOCKET helper. Set socket descriptor. @param mysql_socket Instrumented socket @param fd Socket descriptor - @sa mysql_socket_getfd + @sa mysql_socket_setfd */ static inline void mysql_socket_setfd(MYSQL_SOCKET *mysql_socket, my_socket fd) From e65e054f7b7dd6c4a5a67c432d63cc8fa9f7b18e Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Fri, 3 Apr 2015 16:16:19 +1100 Subject: [PATCH 2/4] spelling: parallell -> parallel The parallelizm of 'l's in the word "parallel" has exceeded the english language specification. Comments only are affected. storage/ndb had too much parallell in code to consider fixing. --- mysql-test/lib/v1/ndb_config_1_node.ini | 2 +- mysql-test/lib/v1/ndb_config_2_node.ini | 2 +- mysql-test/mysql-test-run.pl | 4 ++-- mysql-test/std_data/ndb_config_config.ini | 2 +- storage/innobase/trx/trx0undo.cc | 2 +- storage/maria/maria_chk.c | 2 +- storage/xtradb/trx/trx0undo.cc | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) 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 d989479b6ea19..d8fa5377b7764 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -837,7 +837,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; @@ -6423,7 +6423,7 @@ ($) skip-ssl Dont 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 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/storage/innobase/trx/trx0undo.cc b/storage/innobase/trx/trx0undo.cc index edb85a89c17bb..14da110db3385 100644 --- a/storage/innobase/trx/trx0undo.cc +++ b/storage/innobase/trx/trx0undo.cc @@ -64,7 +64,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 2ea647ea1f5ee..c9d38400bc4f7 100644 --- a/storage/maria/maria_chk.c +++ b/storage/maria/maria_chk.c @@ -1054,7 +1054,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/xtradb/trx/trx0undo.cc b/storage/xtradb/trx/trx0undo.cc index edb85a89c17bb..14da110db3385 100644 --- a/storage/xtradb/trx/trx0undo.cc +++ b/storage/xtradb/trx/trx0undo.cc @@ -64,7 +64,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 From 418887b226c29d3047790cdf189057fc414754db Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Sat, 11 Apr 2015 18:09:57 +1000 Subject: [PATCH 3/4] correct name of MYSQL_BIN_LOG class in comment --- sql/log.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/log.cc b/sql/log.cc index a29e3f8dd99dd..0f55bbeb2d991 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -3271,7 +3271,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", { From 154f7ea88c3e6215cc7bcfd63fc93ed6d2fa06d6 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Sat, 18 Apr 2015 14:57:15 +1000 Subject: [PATCH 4/4] spell recieve -> receive --- man/mysqldump.1 | 2 +- sql/rpl_rli.h | 2 +- sql/sql_show.cc | 2 +- storage/innobase/dict/dict0load.cc | 2 +- storage/ndb/include/ndbapi/NdbEventOperation.hpp | 2 +- .../src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs | 6 +++--- storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp | 2 +- storage/ndb/src/mgmsrv/MgmtSrvr.hpp | 6 +++--- storage/ndb/test/ndbapi/testDict.cpp | 2 +- storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp | 2 +- storage/tokudb/ft-index/ft/ft-flusher.cc | 2 +- storage/xtradb/dict/dict0load.cc | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) 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/sql/rpl_rli.h b/sql/rpl_rli.h index 84a4aa93cd3c8..bf98d1bc99bdf 100644 --- a/sql/rpl_rli.h +++ b/sql/rpl_rli.h @@ -715,7 +715,7 @@ struct rpl_group_info /** 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/sql_show.cc b/sql/sql_show.cc index 6dabd349214d4..b568f201e58bf 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2445,7 +2445,7 @@ int select_result_explain_buffer::send_data(List &items) DBUG_ENTER("select_result_explain_buffer::send_data"); /* - Switch to the recieveing thread, so that we correctly count memory used + Switch to the receiveing thread, so that we correctly count memory used by it. This is needed as it's the receiving thread that will free the memory. */ diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc index 16e64da66194d..700e4f01f0289 100644 --- a/storage/innobase/dict/dict0load.cc +++ b/storage/innobase/dict/dict0load.cc @@ -488,7 +488,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/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.cc b/storage/xtradb/dict/dict0load.cc index 874614bfb5c03..61d65456f98cb 100644 --- a/storage/xtradb/dict/dict0load.cc +++ b/storage/xtradb/dict/dict0load.cc @@ -488,7 +488,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. */