summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/handler.cc2
-rw-r--r--sql/item_func.cc2
-rw-r--r--sql/item_subselect.cc6
-rw-r--r--sql/log.cc2
-rw-r--r--sql/log_event.cc2
-rw-r--r--sql/mysqld.cc2
-rw-r--r--sql/opt_range.cc2
-rw-r--r--sql/parse_file.cc2
-rw-r--r--sql/spatial.h2
-rw-r--r--sql/sql_cache.cc10
-rw-r--r--sql/sql_class.cc4
-rw-r--r--sql/sql_db.cc2
-rw-r--r--sql/sql_select.cc2
-rw-r--r--sql/sql_show.cc2
-rw-r--r--sql/sql_table.cc2
-rw-r--r--sql/sql_yacc.yy14
-rw-r--r--sql/table.h2
17 files changed, 30 insertions, 30 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index 2186d389056..e61fd888f9e 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -2826,7 +2826,7 @@ void handler::adjust_next_insert_id_after_explicit_value(ulonglong nr)
{
/*
If we have set THD::next_insert_id previously and plan to insert an
- explicitely-specified value larger than this, we need to increase
+ explicitly-specified value larger than this, we need to increase
THD::next_insert_id to be greater than the explicit value.
*/
if ((next_insert_id > 0) && (nr >= next_insert_id))
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 57bd004cf88..c6a3459848e 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -4903,7 +4903,7 @@ Item_func_set_user_var::update_hash(void *ptr, uint length,
bool unsigned_arg)
{
/*
- If we set a variable explicitely to NULL then keep the old
+ If we set a variable explicitly to NULL then keep the old
result type of the variable
*/
if (args[0]->type() == Item::FIELD_ITEM)
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index 94e7bc98618..7291f0a5b3f 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -2212,7 +2212,7 @@ Item_in_subselect::row_value_transformer(JOIN *join)
/*
The uncacheable property controls a number of actions, e.g. whether to
save/restore (via init_save_join_tab/restore_tmp) the original JOIN for
- plans with a temp table where the original JOIN was overriden by
+ plans with a temp table where the original JOIN was overridden by
make_simple_join. The UNCACHEABLE_EXPLAIN is ignored by EXPLAIN, thus
non-correlated subqueries will not appear as such to EXPLAIN.
*/
@@ -2508,7 +2508,7 @@ bool Item_in_subselect::create_in_to_exists_cond(JOIN *join_arg)
/*
The uncacheable property controls a number of actions, e.g. whether to
save/restore (via init_save_join_tab/restore_tmp) the original JOIN for
- plans with a temp table where the original JOIN was overriden by
+ plans with a temp table where the original JOIN was overridden by
make_simple_join. The UNCACHEABLE_EXPLAIN is ignored by EXPLAIN, thus
non-correlated subqueries will not appear as such to EXPLAIN.
*/
@@ -4622,7 +4622,7 @@ subselect_hash_sj_engine::choose_partial_match_strategy(
/*
Choose according to global optimizer switch. If only one of the switches is
'ON', then the remaining strategy is the only possible one. The only cases
- when this will be overriden is when the total size of all buffers for the
+ when this will be overridden is when the total size of all buffers for the
merge strategy is bigger than the 'rowid_merge_buff_size' system variable,
or if there isn't enough physical memory to allocate the buffers.
*/
diff --git a/sql/log.cc b/sql/log.cc
index c81869a57e7..d230b1ceb0d 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -4372,7 +4372,7 @@ int MYSQL_BIN_LOG::purge_first_log(Relay_log_info* rli, bool included)
/*
* Need to update the log pos because purge logs has been called
- * after fetching initially the log pos at the begining of the method.
+ * after fetching initially the log pos at the beginning of the method.
*/
if((error=find_log_pos(&rli->linfo, rli->event_relay_log_name, 0)))
{
diff --git a/sql/log_event.cc b/sql/log_event.cc
index c966d36b732..10032707b4d 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -8017,7 +8017,7 @@ void User_var_log_event::print(FILE* file, PRINT_EVENT_INFO* print_event_info)
return;
str_to_hex(hex_str, val, val_len);
/*
- For proper behaviour when mysqlbinlog|mysql, we need to explicitely
+ For proper behaviour when mysqlbinlog|mysql, we need to explicitly
specify the variable's collation. It will however cause problems when
people want to mysqlbinlog|mysql into another server not supporting the
character set. But there's not much to do about this and it's unlikely.
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index c9945044e66..5f84648538e 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -7207,7 +7207,7 @@ struct my_option my_long_options[]=
GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
/*
Because Sys_var_bit does not support command-line options, we need to
- explicitely add one for --autocommit
+ explicitly add one for --autocommit
*/
{"autocommit", 0, "Set default value for autocommit (0 or 1)",
&opt_autocommit, &opt_autocommit, 0,
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index a69709bbf03..9cf6c1d5eab 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -13914,7 +13914,7 @@ int QUICK_GROUP_MIN_MAX_SELECT::next_max()
SELECT [SUM|COUNT|AVG](DISTINCT a,...) FROM t
This method comes to replace the index scan + Unique class
(distinct selection) for loose index scan that visits all the rows of a
- covering index instead of jumping in the begining of each group.
+ covering index instead of jumping in the beginning of each group.
TODO: Placeholder function. To be replaced by a handler API call
@param is_index_scan hint to use index scan instead of random index read
diff --git a/sql/parse_file.cc b/sql/parse_file.cc
index f3dab4f7b2f..1cd294c1c7a 100644
--- a/sql/parse_file.cc
+++ b/sql/parse_file.cc
@@ -660,7 +660,7 @@ parse_quoted_escaped_string(const char *ptr, const char *end,
@param[in,out] ptr pointer to parameter
@param[in] end end of the configuration
- @param[in] line pointer to the line begining
+ @param[in] line pointer to the line beginning
@param[in] base base address for parameter writing (structure
like TABLE)
@param[in] parameter description
diff --git a/sql/spatial.h b/sql/spatial.h
index 6f50acac984..2e449844d47 100644
--- a/sql/spatial.h
+++ b/sql/spatial.h
@@ -352,7 +352,7 @@ protected:
Need to perform the calculation in logical units, since multiplication
can overflow the size data type.
- @arg data pointer to the begining of the points array
+ @arg data pointer to the beginning of the points array
@arg expected_points number of points expected
@arg extra_point_space extra space for each point element in the array
@return true if there are not enough points
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index 42b80d9b143..92961a6ee66 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -2360,7 +2360,7 @@ void Query_cache::invalidate(THD *thd, char *db)
}
/*
The used tables are linked in a circular list;
- loop until we return to the begining.
+ loop until we return to the beginning.
*/
} while (table_block != tables_blocks);
/*
@@ -3301,7 +3301,7 @@ Query_cache::invalidate_query_block_list(THD *thd,
}
/*
- Register given table list begining with given position in tables table of
+ Register given table list beginning with given position in tables table of
block
SYNOPSIS
@@ -4344,7 +4344,7 @@ my_bool Query_cache::move_by_type(uchar **border,
{
Query_cache_block_table *block_table = new_block->table(j);
- // use aligment from begining of table if 'next' is in same block
+ // use aligment from beginning of table if 'next' is in same block
if ((beg_of_table_table <= block_table->next) &&
(block_table->next < end_of_table_table))
((Query_cache_block_table *)(beg_of_new_table_table +
@@ -4354,7 +4354,7 @@ my_bool Query_cache::move_by_type(uchar **border,
else
block_table->next->prev= block_table;
- // use aligment from begining of table if 'prev' is in same block
+ // use aligment from beginning of table if 'prev' is in same block
if ((beg_of_table_table <= block_table->prev) &&
(block_table->prev < end_of_table_table))
((Query_cache_block_table *)(beg_of_new_table_table +
@@ -4851,7 +4851,7 @@ my_bool Query_cache::check_integrity(bool locked)
if (((uchar*)block) + block->length != ((uchar*)block->pnext))
{
DBUG_PRINT("error",
- ("block 0x%lx, type %u, ended at 0x%lx, but next block begining at 0x%lx",
+ ("block 0x%lx, type %u, ended at 0x%lx, but next block beginning at 0x%lx",
(ulong) block, (uint) block->type,
(ulong) (((uchar*)block) + block->length),
(ulong) ((uchar*)block->pnext)));
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 4b6e4bce3c0..5d36f3c09ff 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -1782,7 +1782,7 @@ THD::~THD()
NOTES
This function assumes that all variables at start are long/ulong and
- other types are handled explicitely
+ other types are handled explicitly
*/
void add_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var)
@@ -1832,7 +1832,7 @@ void add_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var)
NOTE
This function assumes that all variables at start are long/ulong and
- other types are handled explicitely
+ other types are handled explicitly
*/
void add_diff_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var,
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index 2ba67cb1b00..0a4e814ec76 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -1777,7 +1777,7 @@ bool mysql_upgrade_db(THD *thd, LEX_STRING *old_db)
create trigger trg1 before insert on t2 for each row set @a:=1
rename database d1 to d2;
- TODO: Triggers, having the renamed database explicitely written
+ TODO: Triggers, having the renamed database explicitly written
in the table qualifiers.
1. when the same database is renamed:
create trigger d1.trg1 before insert on d1.t1 for each row set @a:=1;
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 77a7f8d6c50..61755817b6d 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -2033,7 +2033,7 @@ JOIN::optimize_inner()
}
}
}
- else if (order && // ORDER BY wo/ preceeding GROUP BY
+ else if (order && // ORDER BY wo/ preceding GROUP BY
(simple_order || skip_sort_order)) // which is possibly skippable
{
if (test_if_skip_sort_order(tab, order, select_limit, false,
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index f41fb394b47..0d9758868ea 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -2624,7 +2624,7 @@ int select_result_explain_buffer::send_data(List<Item> &items)
DBUG_ENTER("select_result_explain_buffer::send_data");
/*
- Switch to the recieveing thread, so that we correctly count memory used
+ Switch to the receiveing thread, so that we correctly count memory used
by it. This is needed as it's the receiving thread that will free the
memory.
*/
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 91e0369d7a3..10a400cf44e 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -4226,7 +4226,7 @@ bool validate_comment_length(THD *thd, LEX_STRING *comment, size_t max_len,
create_info Table create information
DESCRIPTION
- If the table character set was not given explicitely,
+ If the table character set was not given explicitly,
let's fetch the database default character set and
apply it to the table.
*/
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index be426ad7c43..7ab11716f93 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -2451,9 +2451,9 @@ master_file_def:
If the user specified a value < BIN_LOG_HEADER_SIZE, adjust it
instead of causing subsequent errors.
We need to do it in this file, because only there we know that
- MASTER_LOG_POS has been explicitely specified. On the contrary
+ MASTER_LOG_POS has been explicitly specified. On the contrary
in change_master() (sql_repl.cc) we cannot distinguish between 0
- (MASTER_LOG_POS explicitely specified as 0) and 0 (unspecified),
+ (MASTER_LOG_POS explicitly specified as 0) and 0 (unspecified),
whereas we want to distinguish (specified 0 means "read the binlog
from 0" (4 in fact), unspecified means "don't change the position
(keep the preceding value)").
@@ -8097,7 +8097,7 @@ checksum:
{
LEX *lex=Lex;
lex->sql_command = SQLCOM_CHECKSUM;
- /* Will be overriden during execution. */
+ /* Will be overridden during execution. */
YYPS->m_lock_type= TL_UNLOCK;
}
table_list opt_checksum_type
@@ -8123,7 +8123,7 @@ repair:
lex->no_write_to_binlog= $2;
lex->check_opt.init();
lex->alter_info.reset();
- /* Will be overriden during execution. */
+ /* Will be overridden during execution. */
YYPS->m_lock_type= TL_UNLOCK;
}
repair_table_or_view
@@ -8165,7 +8165,7 @@ analyze:
lex->no_write_to_binlog= $2;
lex->check_opt.init();
lex->alter_info.reset();
- /* Will be overriden during execution. */
+ /* Will be overridden during execution. */
YYPS->m_lock_type= TL_UNLOCK;
}
analyze_table_list
@@ -8287,7 +8287,7 @@ check: CHECK_SYM
lex->sql_command = SQLCOM_CHECK;
lex->check_opt.init();
lex->alter_info.reset();
- /* Will be overriden during execution. */
+ /* Will be overridden during execution. */
YYPS->m_lock_type= TL_UNLOCK;
}
check_view_or_table
@@ -8337,7 +8337,7 @@ optimize:
lex->no_write_to_binlog= $2;
lex->check_opt.init();
lex->alter_info.reset();
- /* Will be overriden during execution. */
+ /* Will be overridden during execution. */
YYPS->m_lock_type= TL_UNLOCK;
}
table_list
diff --git a/sql/table.h b/sql/table.h
index ef1fd3dccc1..57f32ab923c 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -968,7 +968,7 @@ public:
@param length string length
@retval Pointer to the copied string.
- @retval 0 if an error occured.
+ @retval 0 if an error occurred.
*/
char *store(const char *from, uint length)
{
View Lorry Controller Status