summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlilinjie <lilinjie@uniontech.com>2023-01-04 18:32:54 +0800
committerDaniel Black <daniel@mariadb.org>2023-01-05 07:57:51 +1100
commit758c24dae2c1e03f6c0837028e7e7f931497a9b5 (patch)
tree6fd1fc4ab01ecd2c77bed765cfac96a3b19bf460
parente51a1d6fc0c105d56c6f05efb3d9fd05b7e4f22f (diff)
downloadmariadb-git-758c24dae2c1e03f6c0837028e7e7f931497a9b5.tar.gz
fix typos
Signed-off-by: lilinjie <lilinjie@uniontech.com>
-rw-r--r--sql/field.cc2
-rw-r--r--sql/field.h2
-rw-r--r--sql/sp_head.cc4
-rw-r--r--sql/sql_yacc.yy2
-rw-r--r--sql/sql_yacc_ora.yy2
-rw-r--r--storage/connect/tabfmt.cpp2
6 files changed, 7 insertions, 7 deletions
diff --git a/sql/field.cc b/sql/field.cc
index de92d1dea94..5fc033c0280 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -11287,7 +11287,7 @@ Create_field *Create_field::clone(MEM_ROOT *mem_root) const
}
/**
- Return true if default is an expression that must be saved explicitely
+ Return true if default is an expression that must be saved explicitly
This is:
- Not basic constants
diff --git a/sql/field.h b/sql/field.h
index ce15184ea1d..f1087332087 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -4600,7 +4600,7 @@ public:
return make_field(share, mem_root, (uchar *) 0, (uchar *) "", 0,
field_name_arg);
}
- /* Return true if default is an expression that must be saved explicitely */
+ /* Return true if default is an expression that must be saved explicitly */
bool has_default_expression();
bool has_default_now_unireg_check() const
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index df4ef8522ba..160e66f7bcd 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -2366,7 +2366,7 @@ sp_head::execute_procedure(THD *thd, List<Item> *args)
Disable slow log if:
- Slow logging is enabled (no change needed)
- This is a normal SP (not event log)
- - If we have not explicitely disabled logging of SP
+ - If we have not explicitly disabled logging of SP
*/
if (save_enable_slow_log &&
((!(m_flags & LOG_SLOW_STATEMENTS) &&
@@ -2380,7 +2380,7 @@ sp_head::execute_procedure(THD *thd, List<Item> *args)
Disable general log if:
- If general log is enabled (no change needed)
- This is a normal SP (not event log)
- - If we have not explicitely disabled logging of SP
+ - If we have not explicitly disabled logging of SP
*/
if (!(thd->variables.option_bits & OPTION_LOG_OFF) &&
(!(m_flags & LOG_GENERAL_LOG) &&
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 73922ceb4f4..3025d93de0f 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -1750,7 +1750,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
TRANSACTION can be a non-empty history unit, or can be an identifier
in bit_expr.
- In the grammar below we use %prec to explicitely tell Bison to go
+ In the grammar below we use %prec to explicitly tell Bison to go
through the empty branch in the optional rule only when the lookahead
token does not belong to a small set of selected tokens.
diff --git a/sql/sql_yacc_ora.yy b/sql/sql_yacc_ora.yy
index 3a1b0c0e077..df90ba6c634 100644
--- a/sql/sql_yacc_ora.yy
+++ b/sql/sql_yacc_ora.yy
@@ -1144,7 +1144,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, size_t *yystacksize);
TRANSACTION can be a non-empty history unit, or can be an identifier
in bit_expr.
- In the grammar below we use %prec to explicitely tell Bison to go
+ In the grammar below we use %prec to explicitly tell Bison to go
through the empty branch in the optional rule only when the lookahead
token does not belong to a small set of selected tokens.
diff --git a/storage/connect/tabfmt.cpp b/storage/connect/tabfmt.cpp
index 56d3cc05547..a57f0ef07aa 100644
--- a/storage/connect/tabfmt.cpp
+++ b/storage/connect/tabfmt.cpp
@@ -1055,7 +1055,7 @@ bool TDBCSV::PrepareWriting(PGLOBAL g)
if (!strlen(Field[i])) {
// Generally null fields are not quoted
if (Quoted > 2)
- // Except if explicitely required
+ // Except if explicitly required
strcat(strcat(To_Line, qot), qot);
} else if (Qot && (strchr(Field[i], Sep) || *Field[i] == Qot