summaryrefslogtreecommitdiff
path: root/storage/myisammrg/ha_myisammrg.cc
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-01-07 13:45:59 +0200
committerMichael Widenius <monty@askmonty.org>2011-01-07 13:45:59 +0200
commitb2abd1cb0c7af997cca8819bd7df56b307fcb2b6 (patch)
treea76529ddb605c0177e85753f5d7c7467d39da757 /storage/myisammrg/ha_myisammrg.cc
parent53407ecf172d8336a62114ccb16683687d8e2561 (diff)
downloadmariadb-git-b2abd1cb0c7af997cca8819bd7df56b307fcb2b6.tar.gz
Fixed typos
Patch provided by Dolf Schimmel
Diffstat (limited to 'storage/myisammrg/ha_myisammrg.cc')
-rw-r--r--storage/myisammrg/ha_myisammrg.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc
index c61d65572cb..ff2d01e09c0 100644
--- a/storage/myisammrg/ha_myisammrg.cc
+++ b/storage/myisammrg/ha_myisammrg.cc
@@ -1057,9 +1057,9 @@ THR_LOCK_DATA **ha_myisammrg::store_lock(THD *thd,
/*
When MERGE table is open, but not yet attached, other threads
- could flush it, which means call mysql_lock_abort_for_thread()
+ could flush it, which means calling mysql_lock_abort_for_thread()
on this threads TABLE. 'children_attached' is FALSE in this
- situaton. Since the table is not locked, return no lock data.
+ situation. Since the table is not locked, return no lock data.
*/
if (!this->file->children_attached)
goto end; /* purecov: tested */