diff options
author | Otto Kekalainen <ottoke@amazon.com> | 2023-03-11 11:07:48 -0800 |
---|---|---|
committer | Daniel Black <daniel@mariadb.org> | 2023-03-24 12:54:05 +1100 |
commit | 50c8ef01fc63e32acd38788107ae4029d0f1b9ce (patch) | |
tree | 1ae7f3757935d720d3975c76766f11f494777717 /sql | |
parent | faeca0008bd4ef90b1c9b41171d47b7892deac5e (diff) | |
download | mariadb-git-50c8ef01fc63e32acd38788107ae4029d0f1b9ce.tar.gz |
Fix trivial spelling errors
- agressively -> aggressively
- exising -> existing
- occured -> occurred
- releated -> related
- seperated -> separated
- sucess -> success
- use use -> use
All new code of the whole pull request, including one or several files
that are either new files or modified ones, are contributed under the
BSD-new license. I am contributing on behalf of my employer Amazon Web
Services, Inc.
Diffstat (limited to 'sql')
-rw-r--r-- | sql/ha_partition.cc | 2 | ||||
-rw-r--r-- | sql/replication.h | 48 | ||||
-rw-r--r-- | sql/sp_head.cc | 2 | ||||
-rw-r--r-- | sql/sql_delete.cc | 2 | ||||
-rw-r--r-- | sql/sql_partition.cc | 2 | ||||
-rw-r--r-- | sql/sql_statistics.h | 2 | ||||
-rw-r--r-- | sql/sys_vars.cc | 4 |
7 files changed, 31 insertions, 31 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index c5c683b6666..a366988009e 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -10250,7 +10250,7 @@ void ha_partition::print_error(int error, myf errflag) /* We choose a main handler's print_error if: * m_file has not been initialized, like in bug#42438 - * lookup_errkey is set, which means that an error has occured in the + * lookup_errkey is set, which means that an error has occurred in the main handler, not in individual partitions */ if (m_file && lookup_errkey == (uint)-1) diff --git a/sql/replication.h b/sql/replication.h index 49d896ff1a7..9a5254b490e 100644 --- a/sql/replication.h +++ b/sql/replication.h @@ -83,7 +83,7 @@ typedef struct Trans_observer { @param param The parameter for transaction observers - @retval 0 Sucess + @retval 0 Success @retval 1 Failure */ int (*after_commit)(Trans_param *param); @@ -104,7 +104,7 @@ typedef struct Trans_observer { @note This hook is called wo/ any global mutex held - @retval 0 Sucess + @retval 0 Success @retval 1 Failure */ int (*after_rollback)(Trans_param *param); @@ -151,7 +151,7 @@ typedef struct Binlog_storage_observer { @param log_pos Binlog position after update @param flags flags for binlog storage - @retval 0 Sucess + @retval 0 Success @retval 1 Failure */ int (*after_flush)(Binlog_storage_param *param, @@ -171,7 +171,7 @@ typedef struct Binlog_storage_observer { @param log_pos Binlog position after update @param flags flags for binlog storage - @retval 0 Sucess + @retval 0 Success @retval 1 Failure */ int (*after_sync)(Binlog_storage_param *param, @@ -201,7 +201,7 @@ typedef struct Binlog_transmit_observer { @param log_file Binlog file name to transmit from @param log_pos Binlog position to transmit from - @retval 0 Sucess + @retval 0 Success @retval 1 Failure */ int (*transmit_start)(Binlog_transmit_param *param, @@ -212,7 +212,7 @@ typedef struct Binlog_transmit_observer { @param param Observer common parameter - @retval 0 Sucess + @retval 0 Success @retval 1 Failure */ int (*transmit_stop)(Binlog_transmit_param *param); @@ -232,7 +232,7 @@ typedef struct Binlog_transmit_observer { @param size Size of the header buffer @param len Header length reserved by this observer - @retval 0 Sucess + @retval 0 Success @retval 1 Failure */ int (*reserve_header)(Binlog_transmit_param *param, @@ -249,7 +249,7 @@ typedef struct Binlog_transmit_observer { @param log_file Binlog file name of the event packet to send @param log_pos Binlog position of the event packet to send - @retval 0 Sucess + @retval 0 Success @retval 1 Failure */ int (*before_send_event)(Binlog_transmit_param *param, @@ -263,7 +263,7 @@ typedef struct Binlog_transmit_observer { @param event_buf Binlog event packet buffer sent @param len length of the event packet buffer - @retval 0 Sucess + @retval 0 Success @retval 1 Failure */ int (*after_send_event)(Binlog_transmit_param *param, @@ -277,7 +277,7 @@ typedef struct Binlog_transmit_observer { @param param Observer common parameter - @retval 0 Sucess + @retval 0 Success @retval 1 Failure */ int (*after_reset_master)(Binlog_transmit_param *param); @@ -320,7 +320,7 @@ typedef struct Binlog_relay_IO_observer { @param param Observer common parameter - @retval 0 Sucess + @retval 0 Success @retval 1 Failure */ int (*thread_start)(Binlog_relay_IO_param *param); @@ -330,7 +330,7 @@ typedef struct Binlog_relay_IO_observer { @param param Observer common parameter - @retval 0 Sucess + @retval 0 Success @retval 1 Failure */ int (*thread_stop)(Binlog_relay_IO_param *param); @@ -344,7 +344,7 @@ typedef struct Binlog_relay_IO_observer { @param param Observer common parameter @param flags binlog dump flags - @retval 0 Sucess + @retval 0 Success @retval 1 Failure */ int (*before_request_transmit)(Binlog_relay_IO_param *param, uint32 flags); @@ -358,7 +358,7 @@ typedef struct Binlog_relay_IO_observer { @param event_buf The event packet return after process @param event_len The length of event packet return after process - @retval 0 Sucess + @retval 0 Success @retval 1 Failure */ int (*after_read_event)(Binlog_relay_IO_param *param, @@ -373,7 +373,7 @@ typedef struct Binlog_relay_IO_observer { @param event_len Length of the event packet written to relay log @param flags flags for relay log - @retval 0 Sucess + @retval 0 Success @retval 1 Failure */ int (*after_queue_event)(Binlog_relay_IO_param *param, @@ -385,7 +385,7 @@ typedef struct Binlog_relay_IO_observer { @param param Observer common parameter - @retval 0 Sucess + @retval 0 Success @retval 1 Failure */ int (*after_reset_slave)(Binlog_relay_IO_param *param); @@ -398,7 +398,7 @@ typedef struct Binlog_relay_IO_observer { @param observer The transaction observer to register @param p pointer to the internal plugin structure - @retval 0 Sucess + @retval 0 Success @retval 1 Observer already exists */ int register_trans_observer(Trans_observer *observer, void *p); @@ -409,7 +409,7 @@ int register_trans_observer(Trans_observer *observer, void *p); @param observer The transaction observer to unregister @param p pointer to the internal plugin structure - @retval 0 Sucess + @retval 0 Success @retval 1 Observer not exists */ int unregister_trans_observer(Trans_observer *observer, void *p); @@ -420,7 +420,7 @@ int unregister_trans_observer(Trans_observer *observer, void *p); @param observer The binlog storage observer to register @param p pointer to the internal plugin structure - @retval 0 Sucess + @retval 0 Success @retval 1 Observer already exists */ int register_binlog_storage_observer(Binlog_storage_observer *observer, void *p); @@ -431,7 +431,7 @@ int register_binlog_storage_observer(Binlog_storage_observer *observer, void *p) @param observer The binlog storage observer to unregister @param p pointer to the internal plugin structure - @retval 0 Sucess + @retval 0 Success @retval 1 Observer not exists */ int unregister_binlog_storage_observer(Binlog_storage_observer *observer, void *p); @@ -442,7 +442,7 @@ int unregister_binlog_storage_observer(Binlog_storage_observer *observer, void * @param observer The binlog transmit observer to register @param p pointer to the internal plugin structure - @retval 0 Sucess + @retval 0 Success @retval 1 Observer already exists */ int register_binlog_transmit_observer(Binlog_transmit_observer *observer, void *p); @@ -453,7 +453,7 @@ int register_binlog_transmit_observer(Binlog_transmit_observer *observer, void * @param observer The binlog transmit observer to unregister @param p pointer to the internal plugin structure - @retval 0 Sucess + @retval 0 Success @retval 1 Observer not exists */ int unregister_binlog_transmit_observer(Binlog_transmit_observer *observer, void *p); @@ -464,7 +464,7 @@ int unregister_binlog_transmit_observer(Binlog_transmit_observer *observer, void @param observer The binlog relay IO observer to register @param p pointer to the internal plugin structure - @retval 0 Sucess + @retval 0 Success @retval 1 Observer already exists */ int register_binlog_relay_io_observer(Binlog_relay_IO_observer *observer, void *p); @@ -475,7 +475,7 @@ int register_binlog_relay_io_observer(Binlog_relay_IO_observer *observer, void * @param observer The binlog relay IO observer to unregister @param p pointer to the internal plugin structure - @retval 0 Sucess + @retval 0 Success @retval 1 Observer not exists */ int unregister_binlog_relay_io_observer(Binlog_relay_IO_observer *observer, void *p); diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 35bdd4f9f1c..d24c8067b78 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1356,7 +1356,7 @@ sp_head::execute(THD *thd, bool merge_da_on_success) /* Cursors will use thd->packet, so they may corrupt data which was prepared for sending by upper level. OTOH cursors in the same routine can share this - buffer safely so let use use routine-local packet instead of having own + buffer safely so let use routine-local packet instead of having own packet buffer for each cursor. It is probably safe to use same thd->convert_buff everywhere. diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index d31d0b949ba..9236ced8fe3 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -1602,7 +1602,7 @@ int multi_delete::do_table_deletes(TABLE *table, SORT_INFO *sort_info, /* Send ok to the client - return: 0 sucess + return: 0 success 1 error */ diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index ba9a370a068..c1e618ee5f5 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -4441,7 +4441,7 @@ void get_partition_set(const TABLE *table, uchar *buf, const uint index, RETURN VALUE TRUE Error - FALSE Sucess + FALSE Success DESCRIPTION Read the partition syntax from the current position in the frm file. diff --git a/sql/sql_statistics.h b/sql/sql_statistics.h index c0df15ea4ad..a0e6a89a1ca 100644 --- a/sql/sql_statistics.h +++ b/sql/sql_statistics.h @@ -373,7 +373,7 @@ class Basic_stats_collector { ulonglong count; /* number of values retrieved */ ulonglong count_distinct; /* number of distinct values retrieved */ - /* number of distinct values that occured only once */ + /* number of distinct values that occurred only once */ ulonglong count_distinct_single_occurence; public: diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 1ed3d61bcf8..b1d2b4919f2 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -2063,7 +2063,7 @@ Sys_gtid_strict_mode( "stops with an error if it encounters an event that would cause it to " "generate an out-of-order binlog if executed. " "When ON the same server-id semisync-replicated transactions that " - "duplicate exising ones in binlog are ignored without error " + "duplicate existing ones in binlog are ignored without error " "and slave interruption.", GLOBAL_VAR(opt_gtid_strict_mode), CMD_LINE(OPT_ARG), DEFAULT(FALSE)); @@ -2828,7 +2828,7 @@ static Sys_var_ulong Sys_optimizer_search_depth( static Sys_var_ulong Sys_optimizer_extra_pruning_depth( "optimizer_extra_pruning_depth", "If the optimizer needs to enumerate join prefix of this size or " - "larger, then it will try agressively prune away the search space.", + "larger, then it will try aggressively prune away the search space.", SESSION_VAR(optimizer_extra_pruning_depth), CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, MAX_TABLES+1), DEFAULT(8), BLOCK_SIZE(1)); |