From 63b5e062d0dfa1bf910ff81636a838d96103bf57 Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Wed, 17 May 2017 14:40:12 +0900 Subject: [PATCH 01/24] 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 02/24] 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 03/24] 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 04/24] 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: From 2d7c4c44ac3c69abb83347c93dcf64e45b6eded9 Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Mon, 5 Jun 2017 15:33:54 +0900 Subject: [PATCH 05/24] fixed typo emtpy -> empty --- mysql-test/suite/ndb/t/ndb_multi.test | 4 ++-- sql/ha_ndbcluster_binlog.cc | 4 ++-- storage/myisam/mi_range.c | 2 +- storage/ndb/include/transporter/TransporterCallback.hpp | 2 +- storage/ndb/mcc/frontend/dojo/dojo/dojo.js.uncompressed.js | 2 +- storage/ndb/mcc/frontend/dojo/dojo/selector/acme.js.uncompressed.js | 2 +- storage/ndb/test/include/NdbMgmd.hpp | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mysql-test/suite/ndb/t/ndb_multi.test b/mysql-test/suite/ndb/t/ndb_multi.test index 5abac939c35..970041982bd 100644 --- a/mysql-test/suite/ndb/t/ndb_multi.test +++ b/mysql-test/suite/ndb/t/ndb_multi.test @@ -400,10 +400,10 @@ create table t1(x int) engine=ndb; create table t2(b int primary key) engine=ndb; create table t3_default_engine(c int primary key); --let $MYSQLD_DATADIR= `SELECT @@datadir` -# Write emtpy .ndb file with normal file name +# Write empty .ndb file with normal file name --write_file $MYSQLD_DATADIR/db/t4.ndb EOF -# Write emtpy .ndb file with temporary file name +# Write empty .ndb file with temporary file name --write_file $MYSQLD_DATADIR/db/#sql-1c17_25d0.ndb EOF diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index 1c7fe55035c..a930f6f9222 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -6413,7 +6413,7 @@ Ndb_binlog_thread::do_run() Since the ndb binlog thread adds itself to the "global thread list" it need to look at the "killed" flag and stop the thread to avoid that the server hangs during shutdown while waiting for the "global - thread list" to be emtpy. + thread list" to be empty. */ sql_print_information("NDB Binlog: Server shutdown detected while " "waiting for ndbcluster to start..."); @@ -6591,7 +6591,7 @@ Ndb_binlog_thread::do_run() Since the ndb binlog thread adds itself to the "global thread list" it need to look at the "killed" flag and stop the thread to avoid that the server hangs during shutdown while waiting for the "global - thread list" to be emtpy. + thread list" to be empty. In pre 5.6 versions the thread was also added to "global thread list" but the "global thread *count*" variable was not incremented and thus the same problem didn't exist. diff --git a/storage/myisam/mi_range.c b/storage/myisam/mi_range.c index 9fe5f45a1fe..af4b98dcf52 100644 --- a/storage/myisam/mi_range.c +++ b/storage/myisam/mi_range.c @@ -152,7 +152,7 @@ static ha_rows _mi_record_pos(MI_INFO *info, const uchar *key, operations with a comment like "Not real duplicates", whatever this means. From the condition above we can see that 'skip_end_space' is always false for these operations. The result is that trailing space - counts in key comparison and hence, emtpy strings ('', string length + counts in key comparison and hence, empty strings ('', string length zero, but not NULL) compare less that strings starting with control characters and these in turn compare less than strings starting with blanks. diff --git a/storage/ndb/include/transporter/TransporterCallback.hpp b/storage/ndb/include/transporter/TransporterCallback.hpp index a5bf134dcc2..ff526707693 100644 --- a/storage/ndb/include/transporter/TransporterCallback.hpp +++ b/storage/ndb/include/transporter/TransporterCallback.hpp @@ -212,7 +212,7 @@ class TransporterCallback { * Called to completely empty the send buffer for a node (ie. disconnect). * * Can be called to check that no one has written to the sendbuffer - * since it was reset last time by using the "should_be_emtpy" flag + * since it was reset last time by using the "should_be_empty" flag */ virtual void reset_send_buffer(NodeId node, bool should_be_empty=false) = 0; diff --git a/storage/ndb/mcc/frontend/dojo/dojo/dojo.js.uncompressed.js b/storage/ndb/mcc/frontend/dojo/dojo/dojo.js.uncompressed.js index 22795eb8db1..7294e41fe91 100644 --- a/storage/ndb/mcc/frontend/dojo/dojo/dojo.js.uncompressed.js +++ b/storage/ndb/mcc/frontend/dojo/dojo/dojo.js.uncompressed.js @@ -8515,7 +8515,7 @@ define(["../_base/kernel", "../has", "../dom", "../_base/sniff", "../_base/array // | * `[foo$='bar']` attribute end match // | * `[foo*='bar']` attribute substring match // * `:first-child`, `:last-child`, and `:only-child` positional selectors - // * `:empty` content emtpy selector + // * `:empty` content empty selector // * `:checked` pseudo selector // * `:nth-child(n)`, `:nth-child(2n+1)` style positional calculations // * `:nth-child(even)`, `:nth-child(odd)` positional selectors diff --git a/storage/ndb/mcc/frontend/dojo/dojo/selector/acme.js.uncompressed.js b/storage/ndb/mcc/frontend/dojo/dojo/selector/acme.js.uncompressed.js index cc909f47b93..731af726027 100644 --- a/storage/ndb/mcc/frontend/dojo/dojo/selector/acme.js.uncompressed.js +++ b/storage/ndb/mcc/frontend/dojo/dojo/selector/acme.js.uncompressed.js @@ -1324,7 +1324,7 @@ define("dojo/selector/acme", ["../_base/kernel", "../has", "../dom", "../_base/s // | * `[foo$='bar']` attribute end match // | * `[foo*='bar']` attribute substring match // * `:first-child`, `:last-child`, and `:only-child` positional selectors - // * `:empty` content emtpy selector + // * `:empty` content empty selector // * `:checked` pseudo selector // * `:nth-child(n)`, `:nth-child(2n+1)` style positional calculations // * `:nth-child(even)`, `:nth-child(odd)` positional selectors diff --git a/storage/ndb/test/include/NdbMgmd.hpp b/storage/ndb/test/include/NdbMgmd.hpp index 2ae5c6317d0..0cc4e494095 100644 --- a/storage/ndb/test/include/NdbMgmd.hpp +++ b/storage/ndb/test/include/NdbMgmd.hpp @@ -274,7 +274,7 @@ class NdbMgmd { } } - // Emtpy line terminates argument list + // Empty line terminates argument list if (out.print("\n")){ error("call: print('\n') failed at line %d", __LINE__); return false; From 2eab968bbb8d11cfa83b4bf0ecacc1a6ca722f59 Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Mon, 5 Jun 2017 15:34:58 +0900 Subject: [PATCH 06/24] fixed type messsage -> message --- extra/protobuf/protobuf-2.6.1/src/google/protobuf/test_util.h | 2 +- extra/protobuf/protobuf-2.6.1/src/google/protobuf/test_util_lite.h | 2 +- plugin/test_service_sql_api/test_sql_9_sessions.cc | 2 +- plugin/test_service_sql_api/test_sql_cmds_1.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extra/protobuf/protobuf-2.6.1/src/google/protobuf/test_util.h b/extra/protobuf/protobuf-2.6.1/src/google/protobuf/test_util.h index d449c0091f6..1c13a1a7f61 100644 --- a/extra/protobuf/protobuf-2.6.1/src/google/protobuf/test_util.h +++ b/extra/protobuf/protobuf-2.6.1/src/google/protobuf/test_util.h @@ -65,7 +65,7 @@ class TestUtil { static void SetOneof2(unittest::TestOneof2* message); // Use the repeated versions of the set_*() accessors to modify all the - // repeated fields of the messsage (which should already have been + // repeated fields of the message (which should already have been // initialized with Set*Fields()). Set*Fields() itself only tests // the add_*() accessors. static void ModifyRepeatedFields(unittest::TestAllTypes* message); diff --git a/extra/protobuf/protobuf-2.6.1/src/google/protobuf/test_util_lite.h b/extra/protobuf/protobuf-2.6.1/src/google/protobuf/test_util_lite.h index f250c937dc3..47a2269d363 100644 --- a/extra/protobuf/protobuf-2.6.1/src/google/protobuf/test_util_lite.h +++ b/extra/protobuf/protobuf-2.6.1/src/google/protobuf/test_util_lite.h @@ -52,7 +52,7 @@ class TestUtilLite { static void SetPackedExtensions(unittest::TestPackedExtensionsLite* message); // Use the repeated versions of the set_*() accessors to modify all the - // repeated fields of the messsage (which should already have been + // repeated fields of the message (which should already have been // initialized with Set*Fields()). Set*Fields() itself only tests // the add_*() accessors. static void ModifyRepeatedFields(unittest::TestAllTypesLite* message); diff --git a/plugin/test_service_sql_api/test_sql_9_sessions.cc b/plugin/test_service_sql_api/test_sql_9_sessions.cc index 40e6baa1296..90536e890b4 100644 --- a/plugin/test_service_sql_api/test_sql_9_sessions.cc +++ b/plugin/test_service_sql_api/test_sql_9_sessions.cc @@ -410,7 +410,7 @@ static void handle_error() WRITE_VAL("affected rows: %d\n",sql_affected_rows); WRITE_VAL("server status: %d\n",sql_server_status); WRITE_VAL("warn count: %d\n",sql_warn_count); -// WRITE_VAL("messsage: %s\n",msg); +// WRITE_VAL("message: %s\n",msg); } } diff --git a/plugin/test_service_sql_api/test_sql_cmds_1.cc b/plugin/test_service_sql_api/test_sql_cmds_1.cc index 7ad5137565e..044bfb081a3 100644 --- a/plugin/test_service_sql_api/test_sql_cmds_1.cc +++ b/plugin/test_service_sql_api/test_sql_cmds_1.cc @@ -408,7 +408,7 @@ static void test_com_query(void *p) { WRITE_VAL("server status: %d\n", cbd.server_status); WRITE_VAL("warn count: %d\n", cbd.warn_count); - // WRITE_VAL("messsage: %s\n",msg); + // WRITE_VAL("message: %s\n",msg); } } From a8d6e07ff277468016158f11f7a927a664284484 Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Mon, 5 Jun 2017 15:37:27 +0900 Subject: [PATCH 07/24] fixed typo defualt -> default --- extra/yassl/include/buffer.hpp | 4 ++-- extra/yassl/src/buffer.cpp | 4 ++-- storage/ndb/include/debugger/DebuggerNames.hpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extra/yassl/include/buffer.hpp b/extra/yassl/include/buffer.hpp index 77d2ed8193c..a17d9a613f5 100644 --- a/extra/yassl/include/buffer.hpp +++ b/extra/yassl/include/buffer.hpp @@ -81,7 +81,7 @@ class input_buffer : public Check { ~input_buffer(); - // users can pass defualt zero length buffer and then allocate + // users can pass default zero length buffer and then allocate void allocate(uint s); // for passing to raw writing functions at beginning, then use add_size @@ -158,7 +158,7 @@ class output_buffer : public NoCheck { void set_current(uint c); - // users can pass defualt zero length buffer and then allocate + // users can pass default zero length buffer and then allocate void allocate(uint s); // for passing to reading functions when finished diff --git a/extra/yassl/src/buffer.cpp b/extra/yassl/src/buffer.cpp index 954fdb52837..d41059c3455 100644 --- a/extra/yassl/src/buffer.cpp +++ b/extra/yassl/src/buffer.cpp @@ -86,7 +86,7 @@ input_buffer::~input_buffer() } -// users can pass defualt zero length buffer and then allocate +// users can pass default zero length buffer and then allocate void input_buffer::allocate(uint s) { if (error_ == 0) { @@ -287,7 +287,7 @@ void output_buffer::set_current(uint c) } -// users can pass defualt zero length buffer and then allocate +// users can pass default zero length buffer and then allocate void output_buffer::allocate(uint s) { buffer_ = NEW_YS byte[s]; end_ = buffer_ + s; diff --git a/storage/ndb/include/debugger/DebuggerNames.hpp b/storage/ndb/include/debugger/DebuggerNames.hpp index fc65128078b..faad83607ee 100644 --- a/storage/ndb/include/debugger/DebuggerNames.hpp +++ b/storage/ndb/include/debugger/DebuggerNames.hpp @@ -30,7 +30,7 @@ * RETURNS: Signal name or 0 if none found */ const char * -getSignalName(GlobalSignalNumber gsn, const char * defualtValue = "Unknown"); +getSignalName(GlobalSignalNumber gsn, const char * defaultValue = "Unknown"); /** * getGsn From 6067cd3b78956682f2cc0dbd49fc02c91d91c9b9 Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Mon, 5 Jun 2017 15:38:37 +0900 Subject: [PATCH 08/24] fixed typo 3nd -> 3rd --- 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 0f8070820fc..12a729b5427 100644 --- a/unittest/gunit/mdl-t.cc +++ b/unittest/gunit/mdl-t.cc @@ -2833,7 +2833,7 @@ TEST_F(MDLTest, UnusedConcurrentThree) EXPECT_EQ(0, mdl_get_unused_locks_count()); - /* Now let 3nd thread to release its lock and thus unuse MDL_lock object. */ + /* Now let 3rd thread to release its lock and thus unuse MDL_lock object. */ third_release.notify(); mdl_thread3.join(); From 9c37c2606d554953623173796fd1a6c9a325083e Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Mon, 5 Jun 2017 15:40:26 +0900 Subject: [PATCH 09/24] fixed typo gurantee -> guarantee --- sql/item_timefunc.cc | 2 +- strings/decimal.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index b46b25595a7..e71fc2e0298 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -2308,7 +2308,7 @@ bool Item_func_convert_tz::get_date(MYSQL_TIME *ltime, my_bool not_used; uint second_part= ltime->second_part; my_time_tmp= from_tz->TIME_to_gmt_sec(ltime, ¬_used); - /* my_time_tmp is guranteed to be in the allowed range */ + /* my_time_tmp is guaranteed to be in the allowed range */ if (my_time_tmp) { to_tz->gmt_sec_to_TIME(ltime, my_time_tmp); diff --git a/strings/decimal.c b/strings/decimal.c index fc4e3974eb9..1259eef288b 100644 --- a/strings/decimal.c +++ b/strings/decimal.c @@ -930,7 +930,7 @@ internal_str2dec(const char *from, decimal_t *to, char **end, my_bool fixed) intg=intg1*DIG_PER_DEC1; } } - /* Error is guranteed to be set here */ + /* Error is guaranteed to be set here */ to->intg=intg; to->frac=frac; From 67061ca19519e6dde822adce21dd7998b98152bd Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Mon, 5 Jun 2017 15:41:09 +0900 Subject: [PATCH 10/24] fixed typo Timout -> Timeout --- libevent/event.c | 2 +- storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp | 2 +- storage/ndb/test/ndbapi/testMgm.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libevent/event.c b/libevent/event.c index 6eb5db05c87..9f149c0e8c4 100644 --- a/libevent/event.c +++ b/libevent/event.c @@ -751,7 +751,7 @@ event_add(struct event *ev, const struct timeval *tv) } /* - * we should change the timout state only if the previous event + * we should change the timeout state only if the previous event * addition succeeded. */ if (res != -1 && tv != NULL) { diff --git a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp index 435ba31332e..9d285be22a2 100644 --- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp +++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp @@ -20852,7 +20852,7 @@ void Dbdih::setGCPStopTimeouts() We drop these lower limits in certain tests, to verify that the calculated value for max_failure_time is sufficient. */ - ndbout << "Dbdih::setGCPStopTimeouts() setting minimal GCP timout values" + ndbout << "Dbdih::setGCPStopTimeouts() setting minimal GCP timeout values" << " for test purposes." << endl; micro_GCP_timeout = 0; gcp_timeout = 0; diff --git a/storage/ndb/test/ndbapi/testMgm.cpp b/storage/ndb/test/ndbapi/testMgm.cpp index a9aed8b7653..6bff2da4963 100644 --- a/storage/ndb/test/ndbapi/testMgm.cpp +++ b/storage/ndb/test/ndbapi/testMgm.cpp @@ -133,7 +133,7 @@ int runTestApiTimeoutBasic(NDBT_Context* ctx, NDBT_Step* step) h= ndb_mgm_create_handle(); ndb_mgm_set_connectstring(h, mgmd.getConnectString()); - ndbout << "TEST timout check_connection" << endl; + ndbout << "TEST timeout check_connection" << endl; int errs[] = { 1, 2, 3, -1}; for(int error_ins_no=0; errs[error_ins_no]!=-1; error_ins_no++) From 9faaeb523e7c9e72d9fc6679085f952bee6399a5 Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Mon, 5 Jun 2017 15:44:20 +0900 Subject: [PATCH 11/24] fixed typo becasue -> because --- mysql-test/include/select.inc | 2 +- mysql-test/include/varchar.inc | 2 +- mysys/mf_dirname.c | 4 ++-- mysys/my_file.c | 2 +- sql/rpl_rli.cc | 4 ++-- sql/sql_time.cc | 2 +- sql/unireg.cc | 2 +- storage/heap/hp_hash.c | 2 +- storage/myisam/mi_key.c | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mysql-test/include/select.inc b/mysql-test/include/select.inc index 4393a5a703d..66d5d46938e 100644 --- a/mysql-test/include/select.inc +++ b/mysql-test/include/select.inc @@ -1825,7 +1825,7 @@ CREATE TABLE t1 (gvid int(10) unsigned default NULL, hmid int(10) unsigned defa INSERT INTO t1 VALUES (200001,2,1,1,100,1,1,1,0,0,0,1,0,1,20020425060057,'\\\\ARKIVIO-TESTPDC\\E$',''),(200002,2,2,1,101,1,1,1,0,0,0,1,0,1,20020425060057,'\\\\ARKIVIO-TESTPDC\\C$',''),(200003,1,3,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,1,20020425060427,'c:',NULL); CREATE TABLE t2 ( hmid int(10) unsigned default NULL, volid int(10) unsigned default NULL, sampletid smallint(5) unsigned default NULL, sampletime datetime default NULL, samplevalue bigint(20) unsigned default NULL, KEY idx1 (hmid,volid,sampletid,sampletime)) ENGINE=MyISAM; INSERT INTO t2 VALUES (1,3,10,'2002-06-01 08:00:00',35),(1,3,1010,'2002-06-01 12:00:01',35); -# Disable PS becasue we get more warnings from PS than from normal execution +# Disable PS because we get more warnings from PS than from normal execution --disable_ps_protocol SELECT a.gvid, (SUM(CASE b.sampletid WHEN 140 THEN b.samplevalue ELSE 0 END)) as the_success,(SUM(CASE b.sampletid WHEN 141 THEN b.samplevalue ELSE 0 END)) as the_fail,(SUM(CASE b.sampletid WHEN 142 THEN b.samplevalue ELSE 0 END)) as the_size,(SUM(CASE b.sampletid WHEN 143 THEN b.samplevalue ELSE 0 END)) as the_time FROM t1 a, t2 b WHERE a.hmid = b.hmid AND a.volid = b.volid AND b.sampletime >= 'wrong-date-value' AND b.sampletime < 'wrong-date-value' AND b.sampletid IN (140, 141, 142, 143) GROUP BY a.gvid; --enable_ps_protocol diff --git a/mysql-test/include/varchar.inc b/mysql-test/include/varchar.inc index 74f14745c31..deb2f3b070e 100644 --- a/mysql-test/include/varchar.inc +++ b/mysql-test/include/varchar.inc @@ -161,7 +161,7 @@ select v,count(t) from t1 group by v limit 10; select sql_big_result v,count(t) from t1 group by v limit 10; # -# Test varchar > 512 (special case for GROUP BY becasue of +# Test varchar > 512 (special case for GROUP BY because of # CONVERT_IF_BIGGER_TO_BLOB define) # diff --git a/mysys/mf_dirname.c b/mysys/mf_dirname.c index 8ddd0ba3413..adb319e28e8 100644 --- a/mysys/mf_dirname.c +++ b/mysys/mf_dirname.c @@ -110,7 +110,7 @@ char *convert_dirname(char *to, const char *from, const char *from_end) #endif DBUG_ENTER("convert_dirname"); - /* We use -2 here, becasue we need place for the last FN_LIBCHAR */ + /* We use -2 here, because we need place for the last FN_LIBCHAR */ if (!from_end || (from_end - from) > FN_REFLEN-2) from_end=from+FN_REFLEN -2; @@ -141,7 +141,7 @@ char *convert_dirname(char *to, const char *from, const char *from_end) *to=0; } #else - /* This is ok even if to == from, becasue we need to cut the string */ + /* This is ok even if to == from, because we need to cut the string */ to= strmake(to, from, (size_t) (from_end-from)); #endif diff --git a/mysys/my_file.c b/mysys/my_file.c index b2faed03643..27ff3f1474d 100644 --- a/mysys/my_file.c +++ b/mysys/my_file.c @@ -28,7 +28,7 @@ max_file_limit Files to open NOTES - The request may not fulfilled becasue of system limitations + The request may not fulfilled because of system limitations RETURN Files available to open. diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index 41ebba6f462..19a3b1ce76b 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -748,7 +748,7 @@ int Relay_log_info::wait_for_pos(THD* thd, String* log_name, Why do we have this mechanism instead of simply monitoring slave_running in the loop (we do this too), as CHANGE MASTER/RESET SLAVE require that the SQL thread be stopped? - This is becasue if someones does: + This is because if someones does: STOP SLAVE;CHANGE MASTER/RESET SLAVE; START SLAVE; the change may happen very quickly and we may not notice that slave_running briefly switches between 1/0/1. @@ -970,7 +970,7 @@ int Relay_log_info::wait_for_gtid_set(THD* thd, const Gtid_set* wait_gtid_set, Why do we have this mechanism instead of simply monitoring slave_running in the loop (we do this too), as CHANGE MASTER/RESET SLAVE require that the SQL thread be stopped? - This is becasue if someones does: + This is because if someones does: STOP SLAVE;CHANGE MASTER/RESET SLAVE; START SLAVE; the change may happen very quickly and we may not notice that slave_running briefly switches between 1/0/1. diff --git a/sql/sql_time.cc b/sql/sql_time.cc index 99832f2ecc8..7bcad9f7a20 100644 --- a/sql/sql_time.cc +++ b/sql/sql_time.cc @@ -1124,7 +1124,7 @@ const char *get_date_time_format_str(Known_date_time_format *format, Functions to create default time/date/datetime strings NOTE: - For the moment the Date_time_format argument is ignored becasue + For the moment the Date_time_format argument is ignored because MySQL doesn't support comparing of date/time/datetime strings that are not in arbutary order as dates are compared as strings in some context) diff --git a/sql/unireg.cc b/sql/unireg.cc index 5407605c310..88b61a09e5f 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -969,7 +969,7 @@ static bool pack_fields(File file, List &create_fields, buff[1]= (uchar) field->col; buff[2]= (uchar) field->sc_length; int2store(buff+3, static_cast(field->length)); - /* The +1 is here becasue the col offset in .frm file have offset 1 */ + /* The +1 is here because the col offset in .frm file have offset 1 */ recpos= field->offset+1 + (uint) data_offset; int3store(buff+5,recpos); int2store(buff+8,field->pack_flag); diff --git a/storage/heap/hp_hash.c b/storage/heap/hp_hash.c index 31b2872a07a..e52872c850f 100644 --- a/storage/heap/hp_hash.c +++ b/storage/heap/hp_hash.c @@ -880,7 +880,7 @@ void heap_update_auto_increment(HP_INFO *info, const uchar *record) } /* - The following code works becasue if s_value < 0 then value is 0 + The following code works because if s_value < 0 then value is 0 and if s_value == 0 then value will contain either s_value or the correct value. */ diff --git a/storage/myisam/mi_key.c b/storage/myisam/mi_key.c index d5564dcd46b..b027c6e9879 100644 --- a/storage/myisam/mi_key.c +++ b/storage/myisam/mi_key.c @@ -570,7 +570,7 @@ ulonglong retrieve_auto_increment(MI_INFO *info,const uchar *record) } /* - The following code works becasue if s_value < 0 then value is 0 + The following code works because if s_value < 0 then value is 0 and if s_value == 0 then value will contain either s_value or the correct value. */ From 668959bb8c2dfc3abd4fa77e56718a5c4948fe62 Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Mon, 5 Jun 2017 15:45:25 +0900 Subject: [PATCH 12/24] fixed typo transction -> transaction --- storage/ndb/src/ndbapi/Ndb.cpp | 2 +- storage/ndb/test/src/HugoAsynchTransactions.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/ndb/src/ndbapi/Ndb.cpp b/storage/ndb/src/ndbapi/Ndb.cpp index 2cfab0aabdd..be437f88c5d 100644 --- a/storage/ndb/src/ndbapi/Ndb.cpp +++ b/storage/ndb/src/ndbapi/Ndb.cpp @@ -884,7 +884,7 @@ NdbTransaction* hupp(NdbTransaction* pBuddyTrans); Return Value: Returns a pointer to a connection object. Connected to the same node as pBuddyTrans - and also using the same transction id + and also using the same transaction id Remark: Start transaction. Synchronous. *****************************************************************************/ NdbTransaction* diff --git a/storage/ndb/test/src/HugoAsynchTransactions.cpp b/storage/ndb/test/src/HugoAsynchTransactions.cpp index 5f488d6eb32..68785cbc594 100644 --- a/storage/ndb/test/src/HugoAsynchTransactions.cpp +++ b/storage/ndb/test/src/HugoAsynchTransactions.cpp @@ -511,7 +511,7 @@ HugoAsynchTransactions::callback(int result, taskExecType= NoCommit; } - /* Define a new transction to perform the original task */ + /* Define a new transaction to perform the original task */ if (defineTransactionForTask(tInfo, taskExecType) != 0) { g_err << "Error defining retry transaction in callback" << endl; From d3b9206b5b508c32637e8b910f21ae75af7c47f7 Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Mon, 5 Jun 2017 15:47:07 +0900 Subject: [PATCH 13/24] fixed typo seprator -> separator --- mysys_ssl/my_default.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysys_ssl/my_default.cc b/mysys_ssl/my_default.cc index 5a45200e135..26c3b56f682 100644 --- a/mysys_ssl/my_default.cc +++ b/mysys_ssl/my_default.cc @@ -77,8 +77,8 @@ C_MODE_END check the pointer, use "----args-separator----" here to ease debug if someone misused it. - The args seprator will only be added when - my_getopt_use_args_seprator is set to TRUE before calling + The args separator will only be added when + my_getopt_use_args_separator is set to TRUE before calling load_defaults(); See BUG#25192 From 441b19bc4dae5570423a942021262717890da3fe Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Mon, 5 Jun 2017 15:52:04 +0900 Subject: [PATCH 14/24] fixed typo avaiable -> available --- mysys/mf_iocache.c | 2 +- rapid/plugin/x/ngs/include/ngs/socket_events.h | 2 +- rapid/plugin/x/ngs/src/socket_events.cc | 4 ++-- rapid/plugin/x/src/io/xpl_listener_tcp.cc | 4 ++-- .../dojo/dojox/editor/plugins/TablePlugins.js.uncompressed.js | 4 ++-- storage/ndb/test/ndbapi/testBitfield.cpp | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index bc5f1bb692b..53f92a3bcf8 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -133,7 +133,7 @@ init_functions(IO_CACHE* info) If == 0 then use my_default_record_cache_size type Type of cache seek_offset Where cache should start reading/writing - use_async_io Set to 1 of we should use async_io (if avaiable) + use_async_io Set to 1 of we should use async_io (if available) cache_myflags Bitmap of different flags MY_WME | MY_FAE | MY_NABP | MY_FNABP | MY_DONT_CHECK_FILESIZE diff --git a/rapid/plugin/x/ngs/include/ngs/socket_events.h b/rapid/plugin/x/ngs/include/ngs/socket_events.h index d3c316dfd49..3d094ccbe7c 100644 --- a/rapid/plugin/x/ngs/include/ngs/socket_events.h +++ b/rapid/plugin/x/ngs/include/ngs/socket_events.h @@ -40,7 +40,7 @@ class Socket_events: public Socket_events_interface { private: static void timeout_call(int sock, short which, void *arg); - static void socket_data_avaiable(int sock, short which, void *arg); + static void socket_data_available(int sock, short which, void *arg); struct Timer_data; struct Socket_data; diff --git a/rapid/plugin/x/ngs/src/socket_events.cc b/rapid/plugin/x/ngs/src/socket_events.cc index 0677e23a547..6764d68e0b0 100644 --- a/rapid/plugin/x/ngs/src/socket_events.cc +++ b/rapid/plugin/x/ngs/src/socket_events.cc @@ -133,7 +133,7 @@ bool Socket_events::listen(Socket_interface::Shared_ptr sock, ngs::functioncallback = callback; socket_event->socket = sock; - event_set(&socket_event->ev, static_cast(sock->get_socket_fd()), EV_READ|EV_PERSIST, &Socket_events::socket_data_avaiable, socket_event); + event_set(&socket_event->ev, static_cast(sock->get_socket_fd()), EV_READ|EV_PERSIST, &Socket_events::socket_data_available, socket_event); event_base_set(m_evbase, &socket_event->ev); return 0 == event_add(&socket_event->ev, NULL); @@ -189,7 +189,7 @@ void Socket_events::timeout_call(int sock, short which, void *arg) { } } -void Socket_events::socket_data_avaiable(int sock, short which, void *arg) { +void Socket_events::socket_data_available(int sock, short which, void *arg) { Socket_data *data = (Socket_data*)arg; Operations_factory operations_factory; System_interface::Shared_ptr system_interface(operations_factory.create_system_interface()); diff --git a/rapid/plugin/x/src/io/xpl_listener_tcp.cc b/rapid/plugin/x/src/io/xpl_listener_tcp.cc index cdeb43848bd..6df68afb691 100644 --- a/rapid/plugin/x/src/io/xpl_listener_tcp.cc +++ b/rapid/plugin/x/src/io/xpl_listener_tcp.cc @@ -56,7 +56,7 @@ class Tcp_creator { bind_addresses.clear(); bind_addresses.push_back(BIND_IPv4_ADDRESS); - if (is_ipv6_avaiable()) { + if (is_ipv6_available()) { log_info("IPv6 is available"); bind_addresses.push_back(BIND_IPv6_ADDRESS); } @@ -201,7 +201,7 @@ class Tcp_creator { return ngs::Socket_interface::Shared_ptr(); } - bool is_ipv6_avaiable() { + bool is_ipv6_available() { ngs::Socket_interface::Shared_ptr socket(m_factory.create_socket(PSI_NOT_INSTRUMENTED, AF_INET6, SOCK_STREAM, 0)); const bool has_ipv6 = INVALID_SOCKET != socket->get_socket_fd(); diff --git a/storage/ndb/mcc/frontend/dojo/dojox/editor/plugins/TablePlugins.js.uncompressed.js b/storage/ndb/mcc/frontend/dojo/dojox/editor/plugins/TablePlugins.js.uncompressed.js index f57de3413d6..14478e0ebac 100644 --- a/storage/ndb/mcc/frontend/dojo/dojox/editor/plugins/TablePlugins.js.uncompressed.js +++ b/storage/ndb/mcc/frontend/dojo/dojox/editor/plugins/TablePlugins.js.uncompressed.js @@ -32,7 +32,7 @@ dojo.experimental("dojox.editor.plugins.TablePlugins"); // summary: // A series of plugins that give the Editor the ability to create and edit -// HTML tables. See the end of this document for all avaiable plugins +// HTML tables. See the end of this document for all available plugins // and dojox/editorPlugins/tests/editorTablePlugs.html for an example // // example: @@ -454,7 +454,7 @@ dojo.declare("dojox.editor.plugins.TablePlugins", { //summary: // A collection of Plugins for inserting and modifying tables in the Editor - // See end of this document for all avaiable plugs + // See end of this document for all available plugs // and dojox/editorPlugins/tests/editorTablePlugs.html for an example // // NOT IMPLEMENTED: Not handling cell merge, span or split diff --git a/storage/ndb/test/ndbapi/testBitfield.cpp b/storage/ndb/test/ndbapi/testBitfield.cpp index d76776f5729..af3a21155bd 100644 --- a/storage/ndb/test/ndbapi/testBitfield.cpp +++ b/storage/ndb/test/ndbapi/testBitfield.cpp @@ -549,7 +549,7 @@ testRanges(Uint32 bitmask_size) tmp.fill(sz32, zero); // Bit was free - // 1) Check how much space is avaiable + // 1) Check how much space is available // 2) Create new allocation of lrandom size // 3) Fill data with lrandom data // 4) Update alloc mask From dfcaeeabd7ab607da6a2c123a34d2567d94c5b09 Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Mon, 5 Jun 2017 15:52:53 +0900 Subject: [PATCH 15/24] fixed typo vesion -> version --- plugin/innodb_memcached/daemon_memcached/doc/protocol.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/innodb_memcached/daemon_memcached/doc/protocol.txt b/plugin/innodb_memcached/daemon_memcached/doc/protocol.txt index 4d72920d4e2..e31bb2c52f4 100644 --- a/plugin/innodb_memcached/daemon_memcached/doc/protocol.txt +++ b/plugin/innodb_memcached/daemon_memcached/doc/protocol.txt @@ -330,7 +330,7 @@ settings, documented below. In the other form it has some arguments: stats \r\n Depending on , various internal data is sent by the server. The -kinds of arguments and the data sent are not documented in this vesion +kinds of arguments and the data sent are not documented in this version of the protocol, and are subject to change for the convenience of memcache developers. From b472f74864c6ac82d190de5d033a66bbf15c7a62 Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Mon, 5 Jun 2017 15:53:43 +0900 Subject: [PATCH 16/24] fixed typo ouput -> output --- mysql-test/suite/rpl_ndb/t/disabled.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/suite/rpl_ndb/t/disabled.def b/mysql-test/suite/rpl_ndb/t/disabled.def index bb26c6cbe62..c38d29b6576 100644 --- a/mysql-test/suite/rpl_ndb/t/disabled.def +++ b/mysql-test/suite/rpl_ndb/t/disabled.def @@ -14,7 +14,7 @@ rpl_ndb_set_null : bug #51100 rpl_ndb_ddl : BUG 14785681 RPL_DDL.TEST NEVER RUN # The below two tests runs extra/rpl_tests/rpl_mixed_implicit_commit_binlog # which is maintained upstream and easily breaks due to the inherent -# difference in binlog ouput depending on who's creating the binlog. +# difference in binlog output depending on who's creating the binlog. # These tests should be merged and made much more stable by not having # to hardcode "magic" numbers into the test. Test should also be fixed # to switch binlog_format itself if that is necessary for the test to properly From f8d119d322aa0c4fbfefb149d75dc1cdd1e9c94a Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Mon, 5 Jun 2017 15:54:51 +0900 Subject: [PATCH 17/24] fixed typo recored -> recorded --- sql/binlog.cc | 2 +- storage/ndb/test/ndbapi/cdrserver.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/binlog.cc b/sql/binlog.cc index 52023c41eb4..4ce604ad47c 100644 --- a/sql/binlog.cc +++ b/sql/binlog.cc @@ -5797,7 +5797,7 @@ int MYSQL_BIN_LOG::purge_first_log(Relay_log_info* rli, bool included) Remove logs from index file. - To make crash safe, we copy the content of index file - from index_file_start_offset recored in log_info to + from index_file_start_offset recorded in log_info to crash safe index file firstly and then move the crash safe index file to index file. diff --git a/storage/ndb/test/ndbapi/cdrserver.cpp b/storage/ndb/test/ndbapi/cdrserver.cpp index e6d6671e586..fd4e47b46be 100644 --- a/storage/ndb/test/ndbapi/cdrserver.cpp +++ b/storage/ndb/test/ndbapi/cdrserver.cpp @@ -422,7 +422,7 @@ server(long int servernum) /* Header information */ /* cdrtype not used */ /*short cdrtype; */ /* 1 CDR Typ */ - short cdrlen; /* 2 CDR recored length in bytes excluding CDR type */ + short cdrlen; /* 2 CDR recorded length in bytes excluding CDR type */ short cdrsubtype; /* 1 CDR subtype */ unsigned int cdrid; /* 8 CDR unique number of each call */ unsigned int cdrtime; /* 4 CDR Time in seconds */ From d25c70b72b9d32987af6a1cc727696dc4a1df6b6 Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Mon, 5 Jun 2017 15:57:30 +0900 Subject: [PATCH 18/24] fixed typo Statment -> Statment --- mysql-test/include/execute_with_statistics.inc | 2 +- mysql-test/include/gtid_prepare_and_execute_stmt.inc | 2 +- mysql-test/include/index_merge_delete.inc | 2 +- mysql-test/suite/ndb/t/ndb_join_pushdown.inc | 2 +- mysql-test/suite/ndb_binlog/t/ndb_binlog_get_binlog_stmts_basic.inc | 4 ++-- mysql-test/suite/perfschema/include/prepared_stmts_setup.inc | 2 +- mysql-test/suite/rpl/include/rpl_partition.inc | 2 +- sql/ha_ndbcluster.cc | 2 +- sql/log_event.h | 2 +- sql/sp_instr.cc | 2 +- sql/sql_insert.cc | 2 +- sql/sql_lex.cc | 2 +- sql/sql_parse.cc | 2 +- sql/sql_truncate.cc | 2 +- sql/sys_vars.cc | 2 +- testclients/mysql_client_test.c | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mysql-test/include/execute_with_statistics.inc b/mysql-test/include/execute_with_statistics.inc index c2305fe5247..abec2aaf3dc 100644 --- a/mysql-test/include/execute_with_statistics.inc +++ b/mysql-test/include/execute_with_statistics.inc @@ -2,7 +2,7 @@ # # SUMMARY # -# Explain and execute the select statment in $query. +# Explain and execute the select statement in $query. # Then report 'Last_query_cost' estimate from the query # optimizer and total number of 'Handler_read%' when the # query was executed. diff --git a/mysql-test/include/gtid_prepare_and_execute_stmt.inc b/mysql-test/include/gtid_prepare_and_execute_stmt.inc index 9dddcdfe44c..dcf8c41b1c1 100644 --- a/mysql-test/include/gtid_prepare_and_execute_stmt.inc +++ b/mysql-test/include/gtid_prepare_and_execute_stmt.inc @@ -6,7 +6,7 @@ # ==== Implementation ==== # # 1. SET SESSION GTID_NEXT='UUID:GNO' -# 2. Prepare a statment +# 2. Prepare a statement # 3. Execute the statement # 4. See that an entry is added in 'gtid_executed' table. # diff --git a/mysql-test/include/index_merge_delete.inc b/mysql-test/include/index_merge_delete.inc index 4ad187bc2b0..679a629b4c7 100644 --- a/mysql-test/include/index_merge_delete.inc +++ b/mysql-test/include/index_merge_delete.inc @@ -14,7 +14,7 @@ CREATE TABLE t2 LIKE t1; INSERT INTO t2 SELECT * FROM t1; ANALYZE TABLE t2; -#1. SQL statments with various combinations of comparison operators +#1. SQL statements with various combinations of comparison operators # union and sort_union diff --git a/mysql-test/suite/ndb/t/ndb_join_pushdown.inc b/mysql-test/suite/ndb/t/ndb_join_pushdown.inc index cbc8813339a..feae7b8a03e 100644 --- a/mysql-test/suite/ndb/t/ndb_join_pushdown.inc +++ b/mysql-test/suite/ndb/t/ndb_join_pushdown.inc @@ -1916,7 +1916,7 @@ select straight_join * from ########################### -### Prepared statments #### +### Prepared statements ### ########################### prepare stmt1 from diff --git a/mysql-test/suite/ndb_binlog/t/ndb_binlog_get_binlog_stmts_basic.inc b/mysql-test/suite/ndb_binlog/t/ndb_binlog_get_binlog_stmts_basic.inc index af52449f402..c0d73cf09a5 100644 --- a/mysql-test/suite/ndb_binlog/t/ndb_binlog_get_binlog_stmts_basic.inc +++ b/mysql-test/suite/ndb_binlog/t/ndb_binlog_get_binlog_stmts_basic.inc @@ -59,7 +59,7 @@ insert into binlog_stmt_parts_assoc create table binlog_stmts (txt varchar(1000), stmt_num int); insert into binlog_stmts - select group_concat(right(txt, # Combine rows in statment into 1 + select group_concat(right(txt, # Combine rows in statement into 1 length(txt) - 4) # Trim ### from line start order by line_count separator ' '), stmt_num @@ -68,7 +68,7 @@ insert into binlog_stmts #select * from binlog_stmts; -# Drop ndb_apply_status entries and sort by the statment +# Drop ndb_apply_status entries and sort by the statement # text to get a deterministic order. # # Reasonable order would be sort by (PK-cols, stmt_num) diff --git a/mysql-test/suite/perfschema/include/prepared_stmts_setup.inc b/mysql-test/suite/perfschema/include/prepared_stmts_setup.inc index 0fb14a36698..e59bb41ef38 100644 --- a/mysql-test/suite/perfschema/include/prepared_stmts_setup.inc +++ b/mysql-test/suite/perfschema/include/prepared_stmts_setup.inc @@ -6,7 +6,7 @@ CREATE TABLE t1 (a INT NOT NULL); INSERT INTO t1 VALUES (4), (8), (11), (32), (80); -# Prepared statments +# Prepared statements PREPARE st1 FROM 'SELECT SQRT(POW(?,2) + POW(?,2)) AS hypotenuse'; diff --git a/mysql-test/suite/rpl/include/rpl_partition.inc b/mysql-test/suite/rpl/include/rpl_partition.inc index 65964fd617f..3802ec9228a 100644 --- a/mysql-test/suite/rpl/include/rpl_partition.inc +++ b/mysql-test/suite/rpl/include/rpl_partition.inc @@ -32,7 +32,7 @@ BEGIN SET local_uuid= "36774b1c-6374-11df-a2ca-0ef7ac7a5f6c"; WHILE ins_count > 0 DO - # Must use local variables for statment based replication + # Must use local variables for statement based replication INSERT INTO test.regular_tbl VALUES (NULL, NOW(), cur_user, local_uuid, ins_count,'Non partitioned table! Going to test replication for MySQL'); SET ins_count = ins_count - 1; diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index f802f8e950f..15d4cf7f8f2 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -7450,7 +7450,7 @@ int ha_ndbcluster::rnd_pos(uchar *buf, uchar *pos) * the record could have been deleted in between the "save" and * the rnd_pos. * Therefor we return HA_ERR_RECORD_DELETED in this case rather than - * HA_ERR_KEY_NOT_FOUND (which will cause statment to be aborted) + * HA_ERR_KEY_NOT_FOUND (which will cause statement to be aborted) * */ res= HA_ERR_RECORD_DELETED; diff --git a/sql/log_event.h b/sql/log_event.h index 241ffd45284..c8a2e767cc4 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -420,7 +420,7 @@ typedef struct st_print_event_info These three caches are used by the row-based replication events to collect the header information and the main body of the events making up a statement and in footer section any verbose related details - or comments related to the statment. + or comments related to the statement. */ IO_CACHE head_cache; IO_CACHE body_cache; diff --git a/sql/sp_instr.cc b/sql/sp_instr.cc index 4657f57d66b..b627d302be7 100644 --- a/sql/sp_instr.cc +++ b/sql/sp_instr.cc @@ -319,7 +319,7 @@ bool sp_lex_instr::reset_lex_and_exec_core(THD *thd, /* In case a session state exists do not cache the SELECT stmt. If we - cache SELECT statment when session state information exists, then + cache SELECT statement when session state information exists, then the result sets of this SELECT are cached which contains changed session information. Next time when same query is executed when there is no change in session state, then result sets are picked from cache diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index bf302406815..4117490c1c3 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -2729,7 +2729,7 @@ int Query_result_create::prepare(List &values, SELECT_LEX_UNIT *u) { /* Generated columns are not allowed to be given a value for CREATE TABLE .. - SELECT statment. + SELECT statement. */ my_error(ER_NON_DEFAULT_VALUE_FOR_GENERATED_COLUMN, MYF(0), (*f)->field_name, (*f)->table->s->table_name.str); diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 66512515fcb..593b7c90311 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -4802,7 +4802,7 @@ void unsafe_mixed_statement(LEX::enum_stmt_accessed_table a, which means that both conditions need to be satisfied or any of them is enough. For example, - . BINLOG_DIRECT_ON & TRX_CACHE_NOT_EMPTY means that the statment is + . BINLOG_DIRECT_ON & TRX_CACHE_NOT_EMPTY means that the statement is unsafe when the option is on and trx-cache is not empty; . BINLOG_DIRECT_ON | BINLOG_DIRECT_OFF means the statement is unsafe diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index bf1105d60b3..140a78631dc 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2562,7 +2562,7 @@ mysql_execute_command(THD *thd, bool first_level) } /* - Check if statment should be skipped because of slave filtering + Check if statement should be skipped because of slave filtering rules Exceptions are: diff --git a/sql/sql_truncate.cc b/sql/sql_truncate.cc index 7ac17f9f10b..734b5308d58 100644 --- a/sql/sql_truncate.cc +++ b/sql/sql_truncate.cc @@ -248,7 +248,7 @@ Sql_cmd_truncate_table::handler_truncate(THD *thd, TABLE_LIST *table_ref, /* If truncate method is not implemented then we don't binlog the statement. If truncation has failed in a transactional engine then also we - donot binlog the statment. Only in non transactional engine we binlog + donot binlog the statement. Only in non transactional engine we binlog inspite of errors. */ if (error == HA_ERR_WRONG_COMMAND || diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 838d7700d04..a3eb7a56575 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -1596,7 +1596,7 @@ static bool event_scheduler_update(sys_var *self, THD *thd, enum_var_type type) start/stop, there is a possibility that the server variable can become out of sync with the real event scheduler state. - This can happen with two concurrent statments if the first gets + This can happen with two concurrent statements if the first gets interrupted after start/stop but before retaking LOCK_global_system_variables. However, this problem should be quite rare and it's difficult to avoid it without opening up possibilities diff --git a/testclients/mysql_client_test.c b/testclients/mysql_client_test.c index af880c62607..d8d22eb762c 100644 --- a/testclients/mysql_client_test.c +++ b/testclients/mysql_client_test.c @@ -15444,7 +15444,7 @@ static void test_bug17667() char line_buffer[MAX_TEST_QUERY_LENGTH*2]; /* more than enough room for the query and some marginalia. */ - /* Prepared statments always occurs twice in log */ + /* Prepared statements always occurs twice in log */ if (statement_cursor->qt == QT_PREPARED) expected_hits++; From 624c98bcbf1c14289d7a2934c166dbc10f3c737a Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Mon, 5 Jun 2017 15:58:14 +0900 Subject: [PATCH 19/24] fixed typo Metatdata -> Metadata --- sql/ha_ndbcluster_push.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/ha_ndbcluster_push.cc b/sql/ha_ndbcluster_push.cc index 750ce72ffc2..86ee4ee707a 100644 --- a/sql/ha_ndbcluster_push.cc +++ b/sql/ha_ndbcluster_push.cc @@ -984,7 +984,7 @@ ndb_pushed_builder_ctx::is_pushable_as_child( * * @param[in] table The table access operation to which the key item belongs. * @param[in] key_item The key_item to examine - * @param[in] key_part Metatdata about the key item. + * @param[in] key_part Metadata about the key item. * @param[out] field_parents The set of possible parents for 'key_item' * ('join_root' if keys are constant). * @return True if at least one possible parent was found. (False means that From cb1dc3f1eaffaec0dd6f39cfe72869d69600d47c Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Mon, 5 Jun 2017 16:02:53 +0900 Subject: [PATCH 20/24] fixed typo refered -> referred --- Docs/sp-imp-spec.txt | 4 ++-- .../protobuf-2.6.1/src/google/protobuf/io/tokenizer.h | 2 +- mysql-test/suite/ndb/t/ndb_join_pushdown.inc | 4 ++-- sql/binlog.cc | 2 +- sql/ha_ndbcluster_push.cc | 6 +++--- sql/ha_ndbcluster_push.h | 2 +- sql/mysqld.cc | 2 +- sql/spatial.cc | 4 ++-- sql/sql_cache.cc | 12 ++++++------ sql/table.cc | 2 +- storage/myisam/mi_check.c | 2 +- storage/myisam/myisamchk.c | 2 +- storage/myisam/myisampack.c | 2 +- .../dojox/grid/enhanced/_FocusManager.js.uncompressed.js | 2 +- storage/ndb/src/ndbapi/NdbQueryBuilder.cpp | 4 ++-- storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp | 6 +++--- storage/ndb/src/ndbapi/NdbQueryOperation.cpp | 4 ++-- 17 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Docs/sp-imp-spec.txt b/Docs/sp-imp-spec.txt index ac17a375926..9ca9479d8eb 100644 --- a/Docs/sp-imp-spec.txt +++ b/Docs/sp-imp-spec.txt @@ -296,7 +296,7 @@ The existance of UDFs are checked during the lexical analysis (in sql_lex.cc:find_keyword()). This has the drawback that they must - exist before they are refered to, which was ok before SPs existed, + exist before they are referred to, which was ok before SPs existed, but then it becomes a problem. The first implementation of SP FUNCTIONs will work the same way, but this should be fixed a.s.a.p. (This will required some reworking of the way UDFs are handled, which is why it's @@ -329,7 +329,7 @@ of the mysql.proc table during a query execution, but this it not possible at the present. - So, the solution is to collect the names of the refered FUNCTIONs during + So, the solution is to collect the names of the referred FUNCTIONs during parsing in the lex. Then, before doing anything else in mysql_execute_command(), read all functions from the database an keep them in the THD, where the function diff --git a/extra/protobuf/protobuf-2.6.1/src/google/protobuf/io/tokenizer.h b/extra/protobuf/protobuf-2.6.1/src/google/protobuf/io/tokenizer.h index 8c6220a1d08..98576f56cb6 100644 --- a/extra/protobuf/protobuf-2.6.1/src/google/protobuf/io/tokenizer.h +++ b/extra/protobuf/protobuf-2.6.1/src/google/protobuf/io/tokenizer.h @@ -350,7 +350,7 @@ class LIBPROTOBUF_EXPORT Tokenizer { // ----------------------------------------------------------------- // These helper methods make the parsing code more readable. The - // "character classes" refered to are defined at the top of the .cc file. + // "character classes" referred to are defined at the top of the .cc file. // Basically it is a C++ class with one method: // static bool InClass(char c); // The method returns true if c is a member of this "class", like "Letter" diff --git a/mysql-test/suite/ndb/t/ndb_join_pushdown.inc b/mysql-test/suite/ndb/t/ndb_join_pushdown.inc index feae7b8a03e..e7d3270fb77 100644 --- a/mysql-test/suite/ndb/t/ndb_join_pushdown.inc +++ b/mysql-test/suite/ndb/t/ndb_join_pushdown.inc @@ -181,7 +181,7 @@ where t1.a = 2 and t1.b = 3; # - Same query as above. # - Added explict table locks as cleanup of these is one # (of several?) way to cause released NdbQuery objects to -# be refered. +# be referred. ################################################################ # LOCK'ed tables invokes the same code path as executing @@ -534,7 +534,7 @@ where t2.a = 1; # to find a single common parent by using the equality set # # NOTE: We should take care to join the multiparent linked -# table on field refs. not also being refered from other join expr. +# table on field refs. not also being referred from other join expr. # as this will make them candidates for equality set replacement. # set ndb_join_pushdown=true; diff --git a/sql/binlog.cc b/sql/binlog.cc index 4ce604ad47c..ab856040c92 100644 --- a/sql/binlog.cc +++ b/sql/binlog.cc @@ -5392,7 +5392,7 @@ int MYSQL_BIN_LOG::find_next_relay_log(char log_name[FN_REFLEN+1]) /** Removes files, as part of a RESET MASTER or RESET SLAVE statement, - by deleting all logs refered to in the index file. Then, it starts + by deleting all logs referred to in the index file. Then, it starts writing to a new log file. The new index file will only contain this file. diff --git a/sql/ha_ndbcluster_push.cc b/sql/ha_ndbcluster_push.cc index 86ee4ee707a..d16f0135b2b 100644 --- a/sql/ha_ndbcluster_push.cc +++ b/sql/ha_ndbcluster_push.cc @@ -569,7 +569,7 @@ ndb_pushed_builder_ctx::is_pushable_with_root(const AQP::Table_access* root) * a single parent common to all key fields in the 'REF' * * In order to increase pushability we use the COND_EQUAL sets - * to resolve cases (2) above) where multiple parents are refered. + * to resolve cases (2) above) where multiple parents are referred. * If needed too make a child pushable, we replace parent * references with another from the COND_EQUAL sets which make * it pushable . @@ -658,7 +658,7 @@ ndb_pushed_builder_ctx::is_pushable_as_child( * FIELD_ITEMs as set up by the MySQL optimizer. * - 'common' are those we may refer (possibly through the EQ-sets) * such that all FIELD_ITEMs are from the same parent. - * - 'extended' are those parents refered from some of the + * - 'extended' are those parents referred from some of the * FIELD_ITEMs, and having the rest of the referred FIELD_ITEM * tables available as 'grandparent refs' * (The SPJ block can handle field references to any ancestor @@ -717,7 +717,7 @@ ndb_pushed_builder_ctx::is_pushable_as_child( common_parents.intersect(field_parents); /** - * 'Extended' parents are refered from some 'FIELD_ITEM', and contain + * 'Extended' parents are referred from some 'FIELD_ITEM', and contain * all parents directly referred, or available as 'depend_parents'. * The later excludes those before the first (grand-)parent * available from all 'field_parents' (first_grandparent). diff --git a/sql/ha_ndbcluster_push.h b/sql/ha_ndbcluster_push.h index 4d0bd8134c4..c99dfff6a9e 100644 --- a/sql/ha_ndbcluster_push.h +++ b/sql/ha_ndbcluster_push.h @@ -293,7 +293,7 @@ class ndb_pushed_builder_ctx * - 'common' are those parents for which ::collect_key_refs() * will find key_refs[] (possibly through the EQ-sets) such that all * linkedValues() refer fields from the same parent. - * - 'extended' are those parents refered from some of the + * - 'extended' are those parents referred from some of the * key_refs[], and having the rest of the key_refs[] available as * 'grandparent refs'. */ diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 9d9b57efa2c..5ac930628ac 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6966,7 +6966,7 @@ To see what values a running MySQL server is using, type\n\ It's also needed on some exotic platforms where global variables are not set to 0 when a program starts. - We don't need to set variables refered to in my_long_options + We don't need to set variables referred to in my_long_options as these are initialized by my_getopt. */ diff --git a/sql/spatial.cc b/sql/spatial.cc index cbdae6e6f04..876849ff833 100644 --- a/sql/spatial.cc +++ b/sql/spatial.cc @@ -343,7 +343,7 @@ Geometry *Geometry::create_by_typeid(Geometry_buffer *buffer, int type_id) @param data is a byte string with an optional srid prepending a WKB format byte string, which is called a GEOMETRY byte string and which is the inner storage format of all geometries in MySQL. - @param data_len number of bytes of the byte string refered by data. + @param data_len number of bytes of the byte string referred by data. @param has_srid whether data argument starts with an srid or not. By default it's true, if false, data starts with WKB header, and caller is responsible to specify an srid to this object later. @@ -371,7 +371,7 @@ Geometry *Geometry::construct(Geometry_buffer *buffer, return NULL; /* Don't try to convert endianess but error out because we can't - replace the bytes refered by data, it can be from any source. + replace the bytes referred by data, it can be from any source. Users can call GeometryFromWKB to use WKB of either endianess if they have to pass WKB/Geometry byte string from client to us. */ diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 1568a236945..34f4d805797 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -4846,7 +4846,7 @@ my_bool Query_cache::in_blocks(Query_cache_block * point) if (block->pprev->pnext != block) { DBUG_PRINT("error", - ("block 0x%lx in physical list is incorrect linked, prev block 0x%lx refered as next to 0x%lx (check from 0x%lx)", + ("block 0x%lx in physical list is incorrect linked, prev block 0x%lx referred as next to 0x%lx (check from 0x%lx)", (ulong) block, (ulong) block->pprev, (ulong) block->pprev->pnext, (ulong) point)); @@ -4874,7 +4874,7 @@ my_bool Query_cache::in_blocks(Query_cache_block * point) if (block->pnext->pprev != block) { DBUG_PRINT("error", - ("block 0x%lx in physicel list is incorrect linked, next block 0x%lx refered as prev to 0x%lx (check from 0x%lx)", + ("block 0x%lx in physicel list is incorrect linked, next block 0x%lx referred as prev to 0x%lx (check from 0x%lx)", (ulong) block, (ulong) block->pnext, (ulong) block->pnext->pprev, (ulong) point)); @@ -4903,7 +4903,7 @@ my_bool Query_cache::in_list(Query_cache_block * root, if (block->prev->next != block) { DBUG_PRINT("error", - ("block 0x%lx in list '%s' 0x%lx is incorrect linked, prev block 0x%lx refered as next to 0x%lx (check from 0x%lx)", + ("block 0x%lx in list '%s' 0x%lx is incorrect linked, prev block 0x%lx referred as next to 0x%lx (check from 0x%lx)", (ulong) block, name, (ulong) root, (ulong) block->prev, (ulong) block->prev->next, (ulong) point)); @@ -4932,7 +4932,7 @@ my_bool Query_cache::in_list(Query_cache_block * root, if (block->next->prev != block) { DBUG_PRINT("error", - ("block 0x%lx in list '%s' 0x%lx is incorrect linked, next block 0x%lx refered as prev to 0x%lx (check from 0x%lx)", + ("block 0x%lx in list '%s' 0x%lx is incorrect linked, next block 0x%lx referred as prev to 0x%lx (check from 0x%lx)", (ulong) block, name, (ulong) root, (ulong) block->next, (ulong) block->next->prev, (ulong) point)); @@ -4974,7 +4974,7 @@ my_bool Query_cache::in_table_list(Query_cache_block_table * root, if (table->prev->next != table) { DBUG_PRINT("error", - ("table 0x%lx(0x%lx) in list '%s' 0x%lx(0x%lx) is incorrect linked, prev table 0x%lx(0x%lx) refered as next to 0x%lx(0x%lx) (check from 0x%lx(0x%lx))", + ("table 0x%lx(0x%lx) in list '%s' 0x%lx(0x%lx) is incorrect linked, prev table 0x%lx(0x%lx) referred as next to 0x%lx(0x%lx) (check from 0x%lx(0x%lx))", (ulong) table, (ulong) table->block(), name, (ulong) root, (ulong) root->block(), (ulong) table->prev, (ulong) table->prev->block(), @@ -5009,7 +5009,7 @@ my_bool Query_cache::in_table_list(Query_cache_block_table * root, if (table->next->prev != table) { DBUG_PRINT("error", - ("table 0x%lx(0x%lx) in list '%s' 0x%lx(0x%lx) is incorrect linked, next table 0x%lx(0x%lx) refered as prev to 0x%lx(0x%lx) (check from 0x%lx(0x%lx))", + ("table 0x%lx(0x%lx) in list '%s' 0x%lx(0x%lx) is incorrect linked, next table 0x%lx(0x%lx) referred as prev to 0x%lx(0x%lx) (check from 0x%lx(0x%lx))", (ulong) table, (ulong) table->block(), name, (ulong) root, (ulong) root->block(), (ulong) table->next, (ulong) table->next->block(), diff --git a/sql/table.cc b/sql/table.cc index d7e47a35f5c..1d044192554 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -6448,7 +6448,7 @@ void TABLE::mark_columns_needed_for_update(bool mark_binlog_columns) Field **reg_field; for (reg_field= field ; *reg_field ; reg_field++) { - /* Merge keys is all keys that had a column refered to in the query */ + /* Merge keys is all keys that had a column referred to in the query */ if (merge_keys.is_overlapping((*reg_field)->part_of_key)) bitmap_set_bit(read_set, (*reg_field)->field_index); } diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c index 444fdfc11e6..9b211933dd3 100644 --- a/storage/myisam/mi_check.c +++ b/storage/myisam/mi_check.c @@ -4362,7 +4362,7 @@ int recreate_table(MI_CHECK *param, MI_INFO **org_info, char *filename) my_errno()); goto end; } - /* We are modifing */ + /* We are modifying */ (*org_info)->s->options&= ~HA_OPTION_READ_ONLY_DATA; (void) _mi_readinfo(*org_info,F_WRLCK,0); (*org_info)->state->records=info.state->records; diff --git a/storage/myisam/myisamchk.c b/storage/myisam/myisamchk.c index e6b14d8a895..567a2ff6e0f 100644 --- a/storage/myisam/myisamchk.c +++ b/storage/myisam/myisamchk.c @@ -855,7 +855,7 @@ static int myisamchk(MI_CHECK *param, char * filename) DBUG_RETURN(1); } share=info->s; - share->options&= ~HA_OPTION_READ_ONLY_DATA; /* We are modifing it */ + share->options&= ~HA_OPTION_READ_ONLY_DATA; /* We are modifying it */ share->tot_locks-= share->r_locks; share->r_locks=0; diff --git a/storage/myisam/myisampack.c b/storage/myisam/myisampack.c index 25e7f738c68..b0d76b6b5ab 100644 --- a/storage/myisam/myisampack.c +++ b/storage/myisam/myisampack.c @@ -427,7 +427,7 @@ static MI_INFO *open_isam_file(char *name,int mode) } if (verbose) puts("Recompressing already compressed table"); - share->options&= ~HA_OPTION_READ_ONLY_DATA; /* We are modifing it */ + share->options&= ~HA_OPTION_READ_ONLY_DATA; /* We are modifying it */ } if (! force_pack && share->state.state.records != 0 && (share->state.state.records <= 1 || diff --git a/storage/ndb/mcc/frontend/dojo/dojox/grid/enhanced/_FocusManager.js.uncompressed.js b/storage/ndb/mcc/frontend/dojo/dojox/grid/enhanced/_FocusManager.js.uncompressed.js index 872d089a6bb..9c70af8fb35 100644 --- a/storage/ndb/mcc/frontend/dojo/dojox/grid/enhanced/_FocusManager.js.uncompressed.js +++ b/storage/ndb/mcc/frontend/dojo/dojox/grid/enhanced/_FocusManager.js.uncompressed.js @@ -271,7 +271,7 @@ return declare("dojox.grid.enhanced._FocusManager", _FocusManager, { }, placeArea: function(name, pos, otherAreaName){ // summary: - // Place the area refered by *name* at some logical position relative to an existing area. + // Place the area referred by *name* at some logical position relative to an existing area. // example: // placeArea("myarea","before"|"after",...) // placeArea("myarea","below"|"above",...) diff --git a/storage/ndb/src/ndbapi/NdbQueryBuilder.cpp b/storage/ndb/src/ndbapi/NdbQueryBuilder.cpp index 262dfb66f5e..500b2a18a86 100644 --- a/storage/ndb/src/ndbapi/NdbQueryBuilder.cpp +++ b/storage/ndb/src/ndbapi/NdbQueryBuilder.cpp @@ -819,7 +819,7 @@ NdbQueryBuilder::linkedValue(const NdbQueryOperationDef* parent, const char* att const NdbColumnImpl* column = parentImpl.getTable().getColumn(attr); returnErrIf(column==0, Err_UnknownColumn); // Unknown column - // Locate refered parrent column in parent operations SPJ projection list; + // Locate referred parrent column in parent operations SPJ projection list; // Add if not already present int error = 0; Uint32 colIx = parentImpl.addColumnRef(column, error); @@ -1076,7 +1076,7 @@ NdbQueryBuilder::scanIndex(const NdbDictionary::Index* index, op->m_bound.highKeys > indexImpl.getNoOfColumns(), QRY_TOO_MANY_KEY_VALUES); - // Bind lowKeys, and if applicable, highKeys to the column being refered + // Bind lowKeys, and if applicable, highKeys to the column being referred Uint32 i; for (i=0; im_bound.lowKeys; ++i) { diff --git a/storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp b/storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp index 9a46eb176bf..6611a8609f0 100644 --- a/storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp +++ b/storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp @@ -353,14 +353,14 @@ class NdbQueryOperationDefImpl * Register a linked reference to a column from operation * @param[in] column Column to refer. * @param[out] error Possible error code. - * @return position in list of refered columns available from + * @return position in list of referred columns available from * this (parent) operation. Child ops later refer linked * columns by its position in this list. */ Uint32 addColumnRef(const NdbColumnImpl* column, int& error); /** - * Register a param operand which is refered by this operation. + * Register a param operand which is referred by this operation. * Param values are supplied pr. operation when code is serialized. * @param[in] param Parameter to add. * @return Possible error code. @@ -776,7 +776,7 @@ class NdbLinkedOperandImpl : public NdbQueryOperandImpl { return m_parentOperation; } // 'LinkedSrc' is index into parent op's spj-projection list where - // the refered column value is available + // the referred column value is available Uint32 getLinkedColumnIx() const { return m_parentColumnIx; } diff --git a/storage/ndb/src/ndbapi/NdbQueryOperation.cpp b/storage/ndb/src/ndbapi/NdbQueryOperation.cpp index f3caa63738a..bf5fef2eac1 100644 --- a/storage/ndb/src/ndbapi/NdbQueryOperation.cpp +++ b/storage/ndb/src/ndbapi/NdbQueryOperation.cpp @@ -3794,7 +3794,7 @@ NdbQueryOperationImpl::NdbQueryOperationImpl( m_operationDef(def), m_parent(NULL), m_children(0), - m_maxBatchRows(0), // >0: User specified prefered value, ==0: Use default CFG values + m_maxBatchRows(0), // >0: User specified preferred value, ==0: Use default CFG values m_params(), m_resultBuffer(NULL), m_resultRef(NULL), @@ -4449,7 +4449,7 @@ NdbQueryOperationImpl::prepareAttrInfo(Uint32Buffer& attrInfo) const NdbQueryOperationDefImpl& def = getQueryOperationDef(); /** - * Serialize parameters refered by this NdbQueryOperation. + * Serialize parameters referred by this NdbQueryOperation. * Params for the complete NdbQuery is collected in a single * serializedParams chunk. Each operations params are * proceeded by 'length' for this operation. From f3d7ff136a4a7c2953d7b7ecd90a26fd3e77b8e6 Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Mon, 5 Jun 2017 16:06:13 +0900 Subject: [PATCH 21/24] fixed typo protcol -> protocol --- client/mysqltest.cc | 2 +- mysql-test/lib/v1/mysql-test-run.pl | 2 +- .../src/bindings/xcom/xcom/xcom_transport.c | 18 +++++++++--------- sql/protocol.h | 2 +- storage/ndb/src/mgmsrv/ConfigManager.cpp | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/mysqltest.cc b/client/mysqltest.cc index f472b0fc320..ec81d5af6cd 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -9182,7 +9182,7 @@ int main(int argc, char **argv) var_set_string("MYSQLTEST_FILE", cur_file->file_name); init_re(); - /* Cursor protcol implies ps protocol */ + /* Cursor protocol implies ps protocol */ if (cursor_protocol) ps_protocol= 1; diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl index b97c420e5eb..a64d587bbd6 100755 --- a/mysql-test/lib/v1/mysql-test-run.pl +++ b/mysql-test/lib/v1/mysql-test-run.pl @@ -1030,7 +1030,7 @@ () } # -------------------------------------------------------------------------- - # ps protcol flag + # ps protocol flag # -------------------------------------------------------------------------- if ( $opt_ps_protocol ) { diff --git a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_transport.c b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_transport.c index 526d8fb7aa6..61fe5be9284 100644 --- a/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_transport.c +++ b/rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_transport.c @@ -1307,10 +1307,10 @@ int read_msg(connection_descriptor * rfd, pax_msg *p, int64_t *ret) if(ep->x_type == x_version_req){ /* Negotiation request. See what we can offer */ rfd->x_proto = negotiate_protocol(ep->x_version); - DBGOUT(STRLIT("incoming connection will use protcol version "); + DBGOUT(STRLIT("incoming connection will use protocol version "); NDBG(rfd->x_proto,u); STRLIT(xcom_proto_to_str(rfd->x_proto))); ADD_EVENTS( - add_event(string_arg("incoming connection will use protcol version")); + add_event(string_arg("incoming connection will use protocol version")); add_event(string_arg(xcom_proto_to_str(rfd->x_proto))); ); if(rfd->x_proto > my_xcom_version) @@ -1321,11 +1321,11 @@ int read_msg(connection_descriptor * rfd, pax_msg *p, int64_t *ret) /* Mark connection with negotiated protocol version */ if(rfd->snd_tag == ep->tag){ rfd->x_proto = ep->x_version; - DBGOUT(STRLIT("peer connection will use protcol version "); + DBGOUT(STRLIT("peer connection will use protocol version "); NDBG(rfd->x_proto,u); STRLIT(xcom_proto_to_str(rfd->x_proto))); ADD_EVENTS( - add_event(string_arg("peer connection will use protcol version")); + add_event(string_arg("peer connection will use protocol version")); add_event(string_arg( xcom_proto_to_str(rfd->x_proto))); ); if(rfd->x_proto > my_xcom_version || rfd->x_proto == x_unknown_proto) @@ -1407,10 +1407,10 @@ int buffered_read_msg(connection_descriptor *rfd, srv_buf *buf, pax_msg *p, if(ep->x_type == x_version_req){ /* Negotiation request. See what we can offer */ rfd->x_proto = negotiate_protocol(ep->x_version); - DBGOUT(STRLIT("incoming connection will use protcol version "); + DBGOUT(STRLIT("incoming connection will use protocol version "); NDBG(rfd->x_proto,u); STRLIT(xcom_proto_to_str(rfd->x_proto))); ADD_EVENTS( - add_event(string_arg("incoming connection will use protcol version")); + add_event(string_arg("incoming connection will use protocol version")); add_event(string_arg( xcom_proto_to_str(rfd->x_proto))); ); if(rfd->x_proto > my_xcom_version) @@ -1421,10 +1421,10 @@ int buffered_read_msg(connection_descriptor *rfd, srv_buf *buf, pax_msg *p, /* Mark connection with negotiated protocol version */ if(rfd->snd_tag == ep->tag){ rfd->x_proto = ep->x_version; - DBGOUT(STRLIT("peer connection will use protcol version "); + DBGOUT(STRLIT("peer connection will use protocol version "); NDBG(rfd->x_proto,u); STRLIT(xcom_proto_to_str(rfd->x_proto))); ADD_EVENTS( - add_event(string_arg("peer connection will use protcol version")); + add_event(string_arg("peer connection will use protocol version")); add_event(string_arg( xcom_proto_to_str(rfd->x_proto))); ); if(rfd->x_proto > my_xcom_version || rfd->x_proto == x_unknown_proto) @@ -1947,7 +1947,7 @@ int client_task(task_arg arg) DBGOUT(FN); if (ep->tag == TAG_START && ep->x_type == x_version_reply) { - DBGOUT(STRLIT("client task will use protcol version "); + DBGOUT(STRLIT("client task will use protocol version "); NDBG(ep->x_proto, u); STRLIT(xcom_proto_to_str(ep->x_proto))); if (ep->x_proto == x_unknown_proto) { TERMINATE_CLIENT(ep); diff --git a/sql/protocol.h b/sql/protocol.h index 33a29d9b46e..33d1645ae8e 100644 --- a/sql/protocol.h +++ b/sql/protocol.h @@ -60,7 +60,7 @@ class Protocol { @param length size of the packet @returns - -1 fatal protcol error + -1 fatal protocol error 0 ok 1 non-fatal protocol or parsing error */ diff --git a/storage/ndb/src/mgmsrv/ConfigManager.cpp b/storage/ndb/src/mgmsrv/ConfigManager.cpp index 8fc83270499..6ddbf15168d 100644 --- a/storage/ndb/src/mgmsrv/ConfigManager.cpp +++ b/storage/ndb/src/mgmsrv/ConfigManager.cpp @@ -1826,7 +1826,7 @@ ConfigManager::run() // Build bitmaks of all mgm nodes in config m_config->get_nodemask(m_all_mgm, NDB_MGM_NODE_TYPE_MGM); - // exclude nowait-nodes from config change protcol + // exclude nowait-nodes from config change protocol m_all_mgm.bitANDC(m_opts.nowait_nodes); m_all_mgm.set(m_facade->ownId()); // Never exclude own node From 45857a153be3cefdef2f54a9ee6cfa9f6e04032f Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Mon, 5 Jun 2017 16:09:26 +0900 Subject: [PATCH 22/24] fixed typo UNKOWN -> UNKNOWN --- extra/yassl/src/ssl.cpp | 2 +- extra/yassl/src/yassl_error.cpp | 4 ++-- extra/yassl/taocrypt/include/error.hpp | 4 ++-- extra/yassl/taocrypt/src/asn.cpp | 4 ++-- mysys_ssl/my_getopt.cc | 2 +- sql/share/errmsg-utf8.txt | 2 +- sql/table.cc | 2 +- storage/innobase/include/dict0types.h | 2 +- storage/ndb/src/mgmsrv/Config.cpp | 2 +- unittest/gunit/opt_recperkey-t.cc | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/extra/yassl/src/ssl.cpp b/extra/yassl/src/ssl.cpp index 39244a01b92..862235f21df 100644 --- a/extra/yassl/src/ssl.cpp +++ b/extra/yassl/src/ssl.cpp @@ -346,7 +346,7 @@ int SSL_connect(SSL* ssl) return SSL_SUCCESS; default : - return SSL_FATAL_ERROR; // unkown state + return SSL_FATAL_ERROR; // unknown state } } diff --git a/extra/yassl/src/yassl_error.cpp b/extra/yassl/src/yassl_error.cpp index 5169b7dd5d0..a75afe9ab2b 100644 --- a/extra/yassl/src/yassl_error.cpp +++ b/extra/yassl/src/yassl_error.cpp @@ -242,11 +242,11 @@ void SetErrorString(YasslError error, char* buffer) strncpy(buffer, "ASN: bad Signature Length", max); break; - case UNKOWN_SIG_E : + case UNKNOWN_SIG_E : strncpy(buffer, "ASN: unknown signature OID", max); break; - case UNKOWN_HASH_E : + case UNKNOWN_HASH_E : strncpy(buffer, "ASN: unknown hash OID", max); break; diff --git a/extra/yassl/taocrypt/include/error.hpp b/extra/yassl/taocrypt/include/error.hpp index cb2130d4843..bc0ad20887c 100644 --- a/extra/yassl/taocrypt/include/error.hpp +++ b/extra/yassl/taocrypt/include/error.hpp @@ -57,8 +57,8 @@ TIME_E = 1030, // "bad TIME" DATE_SZ_E = 1031, // "bad Date Size" SIG_LEN_E = 1032, // "bad Signature Length" -UNKOWN_SIG_E = 1033, // "unknown signature OID" -UNKOWN_HASH_E = 1034, // "unknown hash OID" +UNKNOWN_SIG_E = 1033, // "unknown signature OID" +UNKNOWN_HASH_E = 1034, // "unknown hash OID" DSA_SZ_E = 1035, // "bad DSA r or s size" BEFORE_DATE_E = 1036, // "before date in the future" AFTER_DATE_E = 1037, // "after date in the past" diff --git a/extra/yassl/taocrypt/src/asn.cpp b/extra/yassl/taocrypt/src/asn.cpp index e0aef45fc27..a2500ce0ad6 100644 --- a/extra/yassl/taocrypt/src/asn.cpp +++ b/extra/yassl/taocrypt/src/asn.cpp @@ -1012,7 +1012,7 @@ bool CertDecoder::ConfirmSignature(Source& pub) } #endif else { - source_.SetError(UNKOWN_SIG_E); + source_.SetError(UNKNOWN_SIG_E); return false; } @@ -1136,7 +1136,7 @@ word32 DER_Encoder::SetAlgoID(HashType aOID, byte* output) break; default: - error_.SetError(UNKOWN_HASH_E); + error_.SetError(UNKNOWN_HASH_E); return 0; } diff --git a/mysys_ssl/my_getopt.cc b/mysys_ssl/my_getopt.cc index 40ae171fdc2..c44c606f0d6 100644 --- a/mysys_ssl/my_getopt.cc +++ b/mysys_ssl/my_getopt.cc @@ -242,7 +242,7 @@ int my_handle_options(int *argc, char ***argv, { is_cmdline_arg= 1; - /* save the separator too if skip unkown options */ + /* save the separator too if skip unknown options */ if (my_getopt_skip_unknown) (*argv)[argvpos++]= cur_arg; else diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 7425524fd1e..5c26895396d 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -2495,7 +2495,7 @@ ER_UNKNOWN_PROCEDURE 42000 kor "알수 없는 수행문 : '%-.192s'" nor "Ukjent prosedyre %-.192s" norwegian-ny "Ukjend prosedyre %-.192s" - pol "Unkown procedure %-.192s" + pol "Unknown procedure %-.192s" por "'Procedure' '%-.192s' desconhecida" rum "Procedura unknown '%-.192s'" rus "Неизвестная процедура '%-.192s'" diff --git a/sql/table.cc b/sql/table.cc index 1d044192554..c40795d36b4 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -775,7 +775,7 @@ int open_table_def(THD *thd, TABLE_SHARE *share, uint db_flags) } else { - error= 6; // Unkown .frm version + error= 6; // Unknown .frm version goto err; } } diff --git a/storage/innobase/include/dict0types.h b/storage/innobase/include/dict0types.h index fa77bac86c4..cc5518d9567 100644 --- a/storage/innobase/include/dict0types.h +++ b/storage/innobase/include/dict0types.h @@ -110,7 +110,7 @@ extern uint ibuf_debug; Note: the spatial status is part of persistent undo log, so we should not modify the values in MySQL 5.7 */ enum spatial_status_t { - /* Unkown status (undo format in 5.7.9) */ + /* Unknown status (undo format in 5.7.9) */ SPATIAL_UNKNOWN = 0, /** Not used in gis index. */ diff --git a/storage/ndb/src/mgmsrv/Config.cpp b/storage/ndb/src/mgmsrv/Config.cpp index fc142bf7604..f1b2e0dc96f 100644 --- a/storage/ndb/src/mgmsrv/Config.cpp +++ b/storage/ndb/src/mgmsrv/Config.cpp @@ -815,7 +815,7 @@ Config::get_nodemask(NodeBitmask& mask, Uint32 node_type; require(it.get(CFG_TYPE_OF_SECTION, &node_type) == 0); - if (type == NDB_MGM_NODE_TYPE_UNKNOWN || // UNKOWN -> add all nodes to mask + if (type == NDB_MGM_NODE_TYPE_UNKNOWN || // UNKNOWN -> add all nodes to mask type == (ndb_mgm_node_type)node_type) { Uint32 nodeid; diff --git a/unittest/gunit/opt_recperkey-t.cc b/unittest/gunit/opt_recperkey-t.cc index 08b8ea119e2..88f4fee9d22 100644 --- a/unittest/gunit/opt_recperkey-t.cc +++ b/unittest/gunit/opt_recperkey-t.cc @@ -58,7 +58,7 @@ TEST(RecPerKeyTest, RecPerKeyAPI) EXPECT_EQ(key.records_per_key(1), 2.0); EXPECT_EQ(key.records_per_key(2), REC_PER_KEY_UNKNOWN); - // Reset the rec_per_key value to default/unkown + // Reset the rec_per_key value to default/unknown key.set_records_per_key(1, REC_PER_KEY_UNKNOWN); EXPECT_FALSE(key.has_records_per_key(1)); EXPECT_EQ(key.records_per_key(1), REC_PER_KEY_UNKNOWN); From bb62faf2fbf2d73c5298383b286604ef5aa3ee2c Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Mon, 5 Jun 2017 16:15:45 +0900 Subject: [PATCH 23/24] fixed typo initilize -> initialize --- sql/sql_tmp_table.h | 2 +- storage/ndb/mcc/frontend/dojo/dojox/image/SlideShow.js.uncompressed.js | 2 +- unittest/gunit/opt_costconstants-t.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/sql_tmp_table.h b/sql/sql_tmp_table.h index e66f3833498..823f7714aeb 100644 --- a/sql/sql_tmp_table.h +++ b/sql/sql_tmp_table.h @@ -94,7 +94,7 @@ Field* create_tmp_field_from_field(THD *thd, Field* org_field, void get_max_key_and_part_length(uint *max_key_length, uint *max_key_part_length); /** - Initilize the storage engine properties for the alternative temporary table + Initialize the storage engine properties for the alternative temporary table storage engines. */ void init_cache_tmp_engine_properties(); diff --git a/storage/ndb/mcc/frontend/dojo/dojox/image/SlideShow.js.uncompressed.js b/storage/ndb/mcc/frontend/dojo/dojox/image/SlideShow.js.uncompressed.js index e26a7225dd5..b10410a2505 100644 --- a/storage/ndb/mcc/frontend/dojo/dojox/image/SlideShow.js.uncompressed.js +++ b/storage/ndb/mcc/frontend/dojo/dojox/image/SlideShow.js.uncompressed.js @@ -115,7 +115,7 @@ dojo.declare("dojox.image.SlideShow", _request: null, postCreate: function(){ - // summary: Initilizes the widget, sets up listeners and shows the first image + // summary: Initializes the widget, sets up listeners and shows the first image this.inherited(arguments); var img = document.createElement("img"); diff --git a/unittest/gunit/opt_costconstants-t.cc b/unittest/gunit/opt_costconstants-t.cc index 03a8c09b373..8f8ae343ee2 100644 --- a/unittest/gunit/opt_costconstants-t.cc +++ b/unittest/gunit/opt_costconstants-t.cc @@ -65,7 +65,7 @@ class CostConstantsTest : public ::testing::Test { initializer.SetUp(); - // Initilize one storage engine + // Initialize one storage engine LEX_STRING engine_name= {C_STRING_WITH_LEN("InnoDB")}; hton2plugin[0]= new st_plugin_int(); hton2plugin[0]->name= engine_name; From e5cc8a0e4b55150b3938bf615398ca290f2f11e5 Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Mon, 5 Jun 2017 16:16:40 +0900 Subject: [PATCH 24/24] fixed typo finded -> found --- sql/sql_help.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/sql_help.cc b/sql/sql_help.cc index 7e7a9130fdb..a7e3ffcea57 100644 --- a/sql/sql_help.cc +++ b/sql/sql_help.cc @@ -400,7 +400,7 @@ int search_categories(THD *thd, QEP_TAB *categories, items Table of items pfname Field "name" in items select "where" part of query.. - res list of finded names + res list of found names */ void get_all_items_for_category(THD *thd, QEP_TAB *items, Field *pfname,