summaryrefslogtreecommitdiff
path: root/mysys/thr_lock.c
diff options
context:
space:
mode:
authorklemens <ka7@github.com>2017-02-26 16:49:47 +0100
committerSergey Vojtovich <svoj@mariadb.org>2017-03-07 13:38:06 +0400
commit7be541f281225aae8e04bff4210b67688be080bc (patch)
treef6ba5f7862669d13b4c425d44baa7528f42da1d3 /mysys/thr_lock.c
parente823023e4bb48b0db9ee91477076fc20db704769 (diff)
downloadmariadb-git-7be541f281225aae8e04bff4210b67688be080bc.tar.gz
spelling fixes
Diffstat (limited to 'mysys/thr_lock.c')
-rw-r--r--mysys/thr_lock.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c
index 8990cbd5a14..45376f7c5fc 100644
--- a/mysys/thr_lock.c
+++ b/mysys/thr_lock.c
@@ -528,8 +528,8 @@ wait_for_lock(struct st_lock_list *wait, THR_LOCK_DATA *data,
One can use this to signal when a thread is going to wait for a lock.
See debug_sync.cc.
- Beware of waiting for a signal here. The lock has aquired its mutex.
- While waiting on a signal here, the locking thread could not aquire
+ Beware of waiting for a signal here. The lock has acquired its mutex.
+ While waiting on a signal here, the locking thread could not acquire
the mutex to release the lock. One could lock up the table
completely.
@@ -799,8 +799,8 @@ thr_lock(THR_LOCK_DATA *data, THR_LOCK_INFO *owner, ulong lock_wait_timeout)
\ = READ
- + = Request can be satisified.
- - = Request cannot be satisified.
+ + = Request can be satisfied.
+ - = Request cannot be satisfied.
READ_NO_INSERT and WRITE_ALLOW_WRITE should in principle
be incompatible. However this will cause starvation of
@@ -1257,7 +1257,7 @@ end:
/*
Get all locks in a specific order to avoid dead-locks
- Sort acording to lock position and put write_locks before read_locks if
+ Sort according to lock position and put write_locks before read_locks if
lock on same lock. Locks on MERGE tables has lower priority than other
locks of the same type. See comment for lock_priority.
*/