summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuro Ashie <ashie@clear-code.com>2017-12-13 15:30:08 +0900
committerSergey Vojtovich <svoj@mariadb.org>2017-12-18 11:16:47 +0400
commit77030649fb1f492b6dd9351a7d4b36e1aeb29f4d (patch)
tree5f2ed5499bd248a0e01033da0efef294cbcd4e40
parentd91d1c8dbc9ae1b3459719cf6b6f21007d9be99a (diff)
downloadmariadb-git-77030649fb1f492b6dd9351a7d4b36e1aeb29f4d.tar.gz
Fix typos in some comments
-rw-r--r--mysys/lf_alloc-pin.c2
-rw-r--r--sql/sql_lex.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysys/lf_alloc-pin.c b/mysys/lf_alloc-pin.c
index 8a96fccf16a..4e4917962ab 100644
--- a/mysys/lf_alloc-pin.c
+++ b/mysys/lf_alloc-pin.c
@@ -161,7 +161,7 @@ LF_PINS *lf_pinbox_get_pins(LF_PINBOX *pinbox)
pinstack_top_ver is 32 bits; 16 low bits are the index in the
array, to the first element of the list. 16 high bits are a version
(every time the 16 low bits are updated, the 16 high bits are
- incremented). Versioniong prevents the ABA problem.
+ incremented). Versioning prevents the ABA problem.
*/
top_ver= pinbox->pinstack_top_ver;
do
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 069b75628e3..92e6dd6c4a2 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -742,7 +742,7 @@ public:
/* thread handler */
THD *thd;
/*
- SELECT_LEX for hidden SELECT in onion which process global
+ SELECT_LEX for hidden SELECT in union which process global
ORDER BY and LIMIT
*/
st_select_lex *fake_select_lex;