From 63b5e062d0dfa1bf910ff81636a838d96103bf57 Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Wed, 17 May 2017 14:40:12 +0900 Subject: [PATCH 1/4] fixed typo fixed typo director -> directory --- sql/mysqld.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 03817ed3e84..9d9b57efa2c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4436,7 +4436,7 @@ int mysqld_main(int argc, char **argv) { if (chdir("/") < 0) { - fprintf(stderr, "Cannot change to root director: %s\n", + fprintf(stderr, "Cannot change to root directory: %s\n", strerror(errno)); exit(MYSQLD_ABORT_EXIT); } From a05c2728890a045758469a12348604834f0efb8e Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Wed, 17 May 2017 15:19:53 +0900 Subject: [PATCH 2/4] fixed typo fix was was -> was --- unittest/gunit/mdl-t.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unittest/gunit/mdl-t.cc b/unittest/gunit/mdl-t.cc index fdbcc6e11f4..c0cdddcbc32 100644 --- a/unittest/gunit/mdl-t.cc +++ b/unittest/gunit/mdl-t.cc @@ -2224,7 +2224,7 @@ TEST_F(MDLTest, SelfConflict) /* Acquire X lock on the same table. MDL subsystem should be able to detect that conflicting S lock belongs to the same context even though it was - was acquired using "fast path". + acquired using "fast path". */ MDL_REQUEST_INIT(&m_request, MDL_key::TABLE, db_name, table_name1, MDL_EXCLUSIVE, From ca1957bbcf894fc8da6adc6f255b94c76f37a44a Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Fri, 2 Jun 2017 13:39:56 +0900 Subject: [PATCH 3/4] fixed typo flexibilty -> flexibility --- .../libmysqlgcs/src/bindings/xcom/gcs_xcom_notification.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 709a1acb120..790560a514e 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 @@ -28,7 +28,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. From 952c114846cd1a75ae544fd6eff06487ee472d47 Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Fri, 2 Jun 2017 13:49:05 +0900 Subject: [PATCH 4/4] fixed typo successfull -> successful --- mysql-test/suite/parts/inc/partition_11.inc | 4 ++-- mysql-test/suite/parts/inc/partition_check.inc | 2 +- mysql-test/suite/parts/inc/partition_syntax_1.inc | 4 ++-- plugin/keyring/keyring-test/keyring-test.cc | 2 +- .../libmysqlgcs/src/bindings/xcom/gcs_xcom_interface.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 | 4 ++-- 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 +- 18 files changed, 30 insertions(+), 30 deletions(-) diff --git a/mysql-test/suite/parts/inc/partition_11.inc b/mysql-test/suite/parts/inc/partition_11.inc index 9f10f58a5f0..5bd9ddbc09b 100644 --- a/mysql-test/suite/parts/inc/partition_11.inc +++ b/mysql-test/suite/parts/inc/partition_11.inc @@ -10,7 +10,7 @@ eval SET @my_errno= $mysql_errno ; let $run= `SELECT @my_errno = 0`; --enable_query_log # -# If this operation was successfull, check + drop this table +# If this operation was successful, check + drop this table if ($run) { --source suite/parts/inc/partition_10.inc @@ -26,7 +26,7 @@ eval SET @my_errno= $mysql_errno ; let $run= `SELECT @my_errno = 0`; --enable_query_log # -# If this operation was successfull, check + drop this table +# If this operation was successful, check + drop this table if ($run) { --source suite/parts/inc/partition_10.inc diff --git a/mysql-test/suite/parts/inc/partition_check.inc b/mysql-test/suite/parts/inc/partition_check.inc index 235764a034f..e46712d3040 100644 --- a/mysql-test/suite/parts/inc/partition_check.inc +++ b/mysql-test/suite/parts/inc/partition_check.inc @@ -556,7 +556,7 @@ INSERT INTO t1 SET f_int1 = NULL , f_int2 = -@max_row, f_char1 = CAST(-@max_row AS CHAR), f_char2 = CAST(-@max_row AS CHAR), f_charbig = '#NULL#'; -# Some other NULL experiments if preceding INSERT was successfull +# Some other NULL experiments if preceding INSERT was successful --enable_abort_on_error if ($no_debug) { diff --git a/mysql-test/suite/parts/inc/partition_syntax_1.inc b/mysql-test/suite/parts/inc/partition_syntax_1.inc index a7168b6af3b..2084d08a558 100644 --- a/mysql-test/suite/parts/inc/partition_syntax_1.inc +++ b/mysql-test/suite/parts/inc/partition_syntax_1.inc @@ -43,7 +43,7 @@ if (`SELECT @my_errno NOT IN (0,$ER_PARSE_ERROR,$ER_TOO_MANY_PARTITIONS_ERROR, } --enable_query_log # -# If this operation was successfull, print layout + drop this table +# If this operation was successful, print layout + drop this table if ($run) { --source suite/parts/inc/partition_layout_check1.inc @@ -77,7 +77,7 @@ if (`SELECT @my_errno NOT IN (0,$ER_PARSE_ERROR,$ER_TOO_MANY_PARTITIONS_ERROR, } --enable_query_log # -# If this operation was successfull, print layout + drop this table +# If this operation was successful, print layout + drop this table if ($run) { --source suite/parts/inc/partition_layout_check1.inc diff --git a/plugin/keyring/keyring-test/keyring-test.cc b/plugin/keyring/keyring-test/keyring-test.cc index 60227a2cda8..d2944f98014 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); 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 3c3831727aa..c7952749b3c 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 @@ -276,7 +276,7 @@ class Gcs_xcom_interface: public Gcs_interface /** 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/xcom/xcom_base.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_base.c index 73f59a76577..f6d075fb383 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 @@ -1820,7 +1820,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); diff --git a/sql/mdl.cc b/sql/mdl.cc index de250114fd1..ddc7a55e3b7 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -156,7 +156,7 @@ class MDL_map { /* 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 7fa7974ab87..d4266398468 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -621,7 +621,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, 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 32ee0a44ce3..6261ffc4574 100644 --- a/storage/innobase/fts/fts0opt.cc +++ b/storage/innobase/fts/fts0opt.cc @@ -2146,7 +2146,7 @@ fts_optimize_purge_deleted_doc_id_snapshot( /**********************************************************************//** 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 @@ -2165,7 +2165,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((nonnull, warn_unused_result)) dberr_t diff --git a/storage/innobase/include/trx0purge.h b/storage/innobase/include/trx0purge.h index 2a9fb86e9b5..0f73c6e2e22 100644 --- a/storage/innobase/include/trx0purge.h +++ b/storage/innobase/include/trx0purge.h @@ -178,7 +178,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(ulint space_id); @@ -340,7 +340,7 @@ namespace undo { } /* Start writing log information to a special file. - On successfull completion, file is removed. + On successful completion, file is removed. On crash, file is used to complete the truncate action. @param space_id space id of undo tablespace @return DB_SUCCESS or error code. */ diff --git a/storage/innobase/include/ut0new.h b/storage/innobase/include/ut0new.h index 9663f777a9a..59221393690 100644 --- a/storage/innobase/include/ut0new.h +++ b/storage/innobase/include/ut0new.h @@ -303,7 +303,7 @@ class ut_allocator { 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, @@ -522,7 +522,7 @@ class ut_allocator { /** 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 @@ -777,7 +777,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 @@ -797,7 +797,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 20f8baf2fde..c38087f862f 100644 --- a/storage/innobase/trx/trx0purge.cc +++ b/storage/innobase/trx/trx0purge.cc @@ -723,7 +723,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( diff --git a/storage/ndb/include/kernel/signaldata/GetConfig.hpp b/storage/ndb/include/kernel/signaldata/GetConfig.hpp index 8c3056a4f38..5705f827247 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 ead9e3ed145..7054fcead86 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 96c079d965d..d08f0abd259 100644 --- a/storage/ndb/include/ndbapi/NdbInterpretedCode.hpp +++ b/storage/ndb/include/ndbapi/NdbInterpretedCode.hpp @@ -195,7 +195,7 @@ class NdbInterpretedCode * @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 9d0a8e8f9c3..c563cef9299 100644 --- a/unittest/gunit/keyring/keys_container-t.cc +++ b/unittest/gunit/keyring/keys_container-t.cc @@ -786,7 +786,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 @@ -800,7 +800,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"))); @@ -823,7 +823,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))); @@ -856,7 +856,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 c0cdddcbc32..0f8070820fc 100644 --- a/unittest/gunit/mdl-t.cc +++ b/unittest/gunit/mdl-t.cc @@ -4318,7 +4318,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()); @@ -4335,7 +4335,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()); @@ -4408,7 +4408,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 6313293bfba..72d698519a4 100644 --- a/unittest/mytap/tap.c +++ b/unittest/mytap/tap.c @@ -520,7 +520,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: