From 16c695a88e6719ad190c7b35d0a26e25e78efa20 Mon Sep 17 00:00:00 2001 From: Hyunwoo Park Date: Mon, 23 Oct 2017 14:38:28 +0200 Subject: [PATCH 1/1] Bug #86565 fixed typo (contribution) --- plugin/keyring/keyring-test/keyring-test.cc | 8 ++++---- .../libmysqlgcs/src/bindings/xcom/gcs_xcom_interface.h | 2 +- .../libmysqlgcs/src/bindings/xcom/gcs_xcom_notification.h | 2 +- .../libmysqlgcs/src/bindings/xcom/xcom/xcom_base.c | 2 +- sql/mdl.cc | 2 +- sql/sql_load.cc | 2 +- storage/innobase/fts/fts0opt.cc | 4 ++-- storage/innobase/include/trx0purge.h | 2 +- storage/innobase/include/ut0new.h | 8 ++++---- storage/innobase/trx/trx0purge.cc | 2 +- storage/ndb/include/kernel/signaldata/GetConfig.hpp | 2 +- storage/ndb/include/kernel/signaldata/GetTabInfo.hpp | 2 +- storage/ndb/include/ndbapi/NdbInterpretedCode.hpp | 2 +- unittest/gunit/keyring/keys_container-t.cc | 8 ++++---- unittest/gunit/mdl-t.cc | 6 +++--- unittest/mytap/tap.c | 2 +- 16 files changed, 28 insertions(+), 28 deletions(-) diff --git a/plugin/keyring/keyring-test/keyring-test.cc b/plugin/keyring/keyring-test/keyring-test.cc index 751a625..3f8cb9b 100644 --- a/plugin/keyring/keyring-test/keyring-test.cc +++ b/plugin/keyring/keyring-test/keyring-test.cc @@ -61,7 +61,7 @@ void* generate(void *arg) mysql_mutex_lock(&LOCK_verbose); std::cout << "Key generate " << key_id << ' ' << key_type << ' ' << user << ' '; if(result==FALSE) - std::cout << "successfull" << std::endl; + std::cout << "successful" << std::endl; else std::cout << "failed" << std::endl; mysql_mutex_unlock(&LOCK_verbose); @@ -117,7 +117,7 @@ void* store(void *arg) mysql_mutex_lock(&LOCK_verbose); std::cout << "Key store " << key_id << ' ' << key_type << ' ' << user << ' '; if(result==FALSE) - std::cout << "successfull" << std::endl; + std::cout << "successful" << std::endl; else std::cout << "failed" << std::endl; mysql_mutex_unlock(&LOCK_verbose); @@ -169,7 +169,7 @@ void* fetch(void *arg) std::cout << key_type << ' '; std::cout << user << ' '; if(result==FALSE) - std::cout << "successfull" << std::endl; + std::cout << "successful" << std::endl; else std::cout << "failed" << std::endl; mysql_mutex_unlock(&LOCK_verbose); @@ -207,7 +207,7 @@ void* remove(void *arg) mysql_mutex_lock(&LOCK_verbose); std::cout << "Key remove " << key_id << ' ' << user << ' '; if(result==FALSE) - std::cout << "successfull" << std::endl; + std::cout << "successful" << std::endl; else std::cout << "failed" << std::endl; mysql_mutex_unlock(&LOCK_verbose); diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_interface.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_interface.h index 3ea5d0d..060dbb2 100644 --- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_interface.h +++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_interface.h @@ -319,7 +319,7 @@ private: /** Indicates whether SSL has been initialized and if that initialization was - successfull. + successful. */ int m_ssl_init_state; diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_notification.h b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_notification.h index 80bea06..bc13604 100644 --- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_notification.h +++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_notification.h @@ -31,7 +31,7 @@ Abstract class that defines a notification that will be sent from XCOM to MySQL GCS or from an user thread to MySQL GCS. - This is a very simple implementation that chooses simplicity over flexibilty. + This is a very simple implementation that chooses simplicity over flexibility. For example, it does not support notifications on member functions (i.e. methods) and a new notification generates some duplicated code. Note that these limitations could be eliminated with the use of generalized functors. diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_base.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_base.c index 28abf0f..d731304 100644 --- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_base.c +++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_base.c @@ -1609,7 +1609,7 @@ static int proposer_task(task_arg arg) { } /* When we get here, we know the value for this message number, but it may not be the value we tried to push, - so loop until we have a successfull push. */ + so loop until we have a successful push. */ unlock_pax_machine(ep->p); MAY_DBG(FN; STRLIT(" found finished message "); SYCEXP(ep->msgno); STRLIT("seconds since last push "); diff --git a/sql/mdl.cc b/sql/mdl.cc index 4a9ad8a..9229979 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -181,7 +181,7 @@ public: { /* Use thread local copy of unused locks counter for performance/ - scalability reasons. It is updated on both successfull and failed + scalability reasons. It is updated on both successful and failed attempts to delete unused MDL_lock objects in order to avoid infinite loops, */ diff --git a/sql/sql_load.cc b/sql/sql_load.cc index a66e4f0..d534766 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -617,7 +617,7 @@ bool Sql_cmd_load_table::execute_inner(THD *thd, the destructor of read_info will call end_io_cache() which will flush read_info, so we will finally have this in the binlog: - Append_block # The last successfull block + Append_block # The last successful block Delete_file Append_block # The failing block which is nonsense. diff --git a/storage/innobase/fts/fts0opt.cc b/storage/innobase/fts/fts0opt.cc index f424f50..0155349 100644 --- a/storage/innobase/fts/fts0opt.cc +++ b/storage/innobase/fts/fts0opt.cc @@ -2208,7 +2208,7 @@ func_exit: /**********************************************************************//** Copy the deleted doc ids that will be purged during this optimize run to the being deleted FTS auxiliary tables. The transaction is committed -upon successfull copy and rolled back on DB_DUPLICATE_KEY error. +upon successful copy and rolled back on DB_DUPLICATE_KEY error. @return DB_SUCCESS if all OK */ static ulint @@ -2227,7 +2227,7 @@ fts_optimize_being_deleted_count( /*********************************************************************//** Copy the deleted doc ids that will be purged during this optimize run to the being deleted FTS auxiliary tables. The transaction is committed -upon successfull copy and rolled back on DB_DUPLICATE_KEY error. +upon successful copy and rolled back on DB_DUPLICATE_KEY error. @return DB_SUCCESS if all OK */ static MY_ATTRIBUTE((warn_unused_result)) dberr_t diff --git a/storage/innobase/include/trx0purge.h b/storage/innobase/include/trx0purge.h index c300b16..a14841e 100644 --- a/storage/innobase/include/trx0purge.h +++ b/storage/innobase/include/trx0purge.h @@ -497,7 +497,7 @@ namespace undo { to the log file and then removing it from the disk. If we are going to remove it from disk then why write magic number? This is to safeguard from unlink (file-system) anomalies that will - keep the link to the file even after unlink action is successfull + keep the link to the file even after unlink action is successful and ref-count = 0. @param[in] space_id ID of the undo tablespace to truncate.*/ void done_logging(space_id_t space_id); diff --git a/storage/innobase/include/ut0new.h b/storage/innobase/include/ut0new.h index add655c..65a947e 100644 --- a/storage/innobase/include/ut0new.h +++ b/storage/innobase/include/ut0new.h @@ -308,7 +308,7 @@ public: If the allocation fails this method may throw an exception. This is mandated by the standard and if it returns NULL instead, then STL containers that use it (e.g. std::vector) may get confused. - After successfull allocation the returned pointer must be passed + After successful allocation the returned pointer must be passed to ut_allocator::deallocate() when no longer needed. @param[in] n_elements number of elements @param[in] hint pointer to a nearby memory location, @@ -528,7 +528,7 @@ public: /** Allocate, trace the allocation and construct 'n_elements' objects of type 'T'. If the allocation fails or if some of the constructors throws an exception, then this method will return NULL. It does not - throw exceptions. After successfull completion the returned pointer + throw exceptions. After successful completion the returned pointer must be passed to delete_array() when no longer needed. @param[in] n_elements number of elements to allocate @param[in] file file name of the caller @@ -783,7 +783,7 @@ For example: instead of use: Foo* f = UT_NEW(Foo(args), mem_key_some); Upon failure to allocate the memory, this macro may return NULL. It -will not throw exceptions. After successfull allocation the returned +will not throw exceptions. After successful allocation the returned pointer must be passed to UT_DELETE() when no longer needed. @param[in] expr any expression that could follow "new" @param[in] key performance schema memory tracing key @@ -803,7 +803,7 @@ For example: instead of use: Foo* f = UT_NEW_NOKEY(Foo(args)); Upon failure to allocate the memory, this macro may return NULL. It -will not throw exceptions. After successfull allocation the returned +will not throw exceptions. After successful allocation the returned pointer must be passed to UT_DELETE() when no longer needed. @param[in] expr any expression that could follow "new" @return pointer to the created object or NULL */ diff --git a/storage/innobase/trx/trx0purge.cc b/storage/innobase/trx/trx0purge.cc index c8a0858..bedd5ea 100644 --- a/storage/innobase/trx/trx0purge.cc +++ b/storage/innobase/trx/trx0purge.cc @@ -783,7 +783,7 @@ namespace undo { the log file and then removing it from the disk. If we are going to remove it from disk then why write magic number ? This is to safeguard from unlink (file-system) anomalies that will keep - the link to the file even after unlink action is successfull and + the link to the file even after unlink action is successful and ref-count = 0. @param[in] space_id id of the undo tablespace to truncate.*/ void done_logging(space_id_t space_id) diff --git a/storage/ndb/include/kernel/signaldata/GetConfig.hpp b/storage/ndb/include/kernel/signaldata/GetConfig.hpp index 8c3056a..5705f82 100644 --- a/storage/ndb/include/kernel/signaldata/GetConfig.hpp +++ b/storage/ndb/include/kernel/signaldata/GetConfig.hpp @@ -26,7 +26,7 @@ /** * GetConfig - Get the node's current configuration * - * Successfull return = GET_CONFIG_CONF - a long signal + * Successful return = GET_CONFIG_CONF - a long signal */ class GetConfigReq { /** diff --git a/storage/ndb/include/kernel/signaldata/GetTabInfo.hpp b/storage/ndb/include/kernel/signaldata/GetTabInfo.hpp index ead9e3e..7054fce 100644 --- a/storage/ndb/include/kernel/signaldata/GetTabInfo.hpp +++ b/storage/ndb/include/kernel/signaldata/GetTabInfo.hpp @@ -26,7 +26,7 @@ /** * GetTabInfo - Get table info from DICT * - * Successfull return = series of DICTTABINFO-signals + * Successful return = series of DICTTABINFO-signals */ class GetTabInfoReq { /** diff --git a/storage/ndb/include/ndbapi/NdbInterpretedCode.hpp b/storage/ndb/include/ndbapi/NdbInterpretedCode.hpp index 96c079d..d08f0ab 100644 --- a/storage/ndb/include/ndbapi/NdbInterpretedCode.hpp +++ b/storage/ndb/include/ndbapi/NdbInterpretedCode.hpp @@ -195,7 +195,7 @@ public: * @param RegLValue register to use as left hand side of condition * @param RegRValue register to use as right hand side of condition * @param Label Program label to jump to if condition is true - * @return 0 if successfull, -1 otherwise. + * @return 0 if successful, -1 otherwise. */ int branch_ge(Uint32 RegLvalue, Uint32 RegRvalue, Uint32 Label); int branch_gt(Uint32 RegLvalue, Uint32 RegRvalue, Uint32 Label); diff --git a/unittest/gunit/keyring/keys_container-t.cc b/unittest/gunit/keyring/keys_container-t.cc index 56defa4..e22cdc3 100644 --- a/unittest/gunit/keyring/keys_container-t.cc +++ b/unittest/gunit/keyring/keys_container-t.cc @@ -856,7 +856,7 @@ namespace keyring__keys_container_unittest Mock_serialized_object *mock_serialized_object= new Mock_serialized_object; EXPECT_CALL(*keyring_io, init(Pointee(StrEq(file_name)))) - .WillOnce(Return(0)); // init successfull + .WillOnce(Return(0)); // init successful EXPECT_CALL(*keyring_io, get_serialized_object(_)) .WillOnce(DoAll(SetArgPointee<0>(mock_serialized_object), Return(FALSE))); EXPECT_CALL(*mock_serialized_object, has_next_key()).WillOnce(Return(FALSE)); // no keys to read @@ -870,7 +870,7 @@ namespace keyring__keys_container_unittest keys_container= new Keys_container(logger); EXPECT_CALL(*keyring_io, init(Pointee(StrEq(file_name)))) - .WillOnce(Return(0)); // init successfull + .WillOnce(Return(0)); // init successful EXPECT_CALL(*keyring_io, get_serialized_object(_)).WillOnce(Return(TRUE)); EXPECT_CALL(*logger, log(MY_ERROR_LEVEL, StrEq("Error while loading keyring content. The keyring might be malformed"))); @@ -893,7 +893,7 @@ namespace keyring__keys_container_unittest Mock_serialized_object *mock_serialized_object= new Mock_serialized_object; EXPECT_CALL(*keyring_io, init(Pointee(StrEq(file_name)))) - .WillOnce(Return(0)); // init successfull + .WillOnce(Return(0)); // init successful { InSequence dummy; EXPECT_CALL(*keyring_io, get_serialized_object(_)).WillOnce(DoAll(SetArgPointee<0>(mock_serialized_object), Return(FALSE))); @@ -926,7 +926,7 @@ namespace keyring__keys_container_unittest buffer->position= 0; //rewind buffer EXPECT_CALL(*keyring_io, init(Pointee(StrEq(file_name)))) - .WillOnce(Return(0)); // init successfull + .WillOnce(Return(0)); // init successful { InSequence dummy; EXPECT_CALL(*keyring_io, get_serialized_object(_)).WillOnce(DoAll(SetArgPointee<0>(buffer), Return(FALSE))); diff --git a/unittest/gunit/mdl-t.cc b/unittest/gunit/mdl-t.cc index b4341de..aefd812 100644 --- a/unittest/gunit/mdl-t.cc +++ b/unittest/gunit/mdl-t.cc @@ -4326,7 +4326,7 @@ TEST_F(MDLHtonNotifyTest, NotifyAcquireFail) EXPECT_FALSE(m_mdl_context.try_acquire_lock(&request)); EXPECT_EQ(m_null_ticket, request.ticket); /* - We treat failure to acquire X lock after successfull pre-acquire + We treat failure to acquire X lock after successful pre-acquire notification in the same way as lock release. */ EXPECT_EQ(1U, pre_acquire_count()); @@ -4343,7 +4343,7 @@ TEST_F(MDLHtonNotifyTest, NotifyAcquireFail) EXPECT_TRUE(m_mdl_context.acquire_lock(&request, zero_timeout)); /* - Again we treat failure to acquire X lock after successfull pre-acquire + Again we treat failure to acquire X lock after successful pre-acquire notification in the same way as lock release. */ EXPECT_EQ(1U, pre_acquire_count()); @@ -4416,7 +4416,7 @@ TEST_F(MDLHtonNotifyTest, NotifyUpgrade) reset_counts_and_keys(); /* - Now case when notification is successfull but we fail to upgrade for some + Now case when notification is successful but we fail to upgrade for some other reason. */ diff --git a/unittest/mytap/tap.c b/unittest/mytap/tap.c index 027d92d..b4f5e70 100644 --- a/unittest/mytap/tap.c +++ b/unittest/mytap/tap.c @@ -536,7 +536,7 @@ int exit_status() { At the end, a complete test report should be written, with some statistics. If the test returns EXIT_SUCCESS, all tests were - successfull, otherwise at least one test failed. + successful, otherwise at least one test failed. To get a TAP complient output and exit status, report the exit status in the following manner: -- 2.8.3.windows.1