diff options
author | Alexander Barkov <bar@mariadb.com> | 2019-09-24 11:16:36 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.com> | 2019-09-24 11:18:39 +0400 |
commit | 5f118b26c83960c8fa98bfd544f57ffd76b55304 (patch) | |
tree | 762e9475ea3b0e402ebd0571a55958b377a3fab4 /storage/myisam/mi_locking.c | |
parent | 896974fc3d721aabe1afbf637a566cab856a731d (diff) | |
parent | 67b0faa29e59387b74ae8547c96cf0f31fc3d9d1 (diff) | |
download | mariadb-git-5f118b26c83960c8fa98bfd544f57ffd76b55304.tar.gz |
Merge remote-tracking branch 'origin/5.5' into 10.1
Diffstat (limited to 'storage/myisam/mi_locking.c')
-rw-r--r-- | storage/myisam/mi_locking.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisam/mi_locking.c b/storage/myisam/mi_locking.c index 3ec4026d6db..ace6bbb82f3 100644 --- a/storage/myisam/mi_locking.c +++ b/storage/myisam/mi_locking.c @@ -446,7 +446,7 @@ my_bool mi_check_status(void *param) @param org_table @param new_table that should point on org_lock. new_table is 0 - in case this is the first occurence of the table in the lock + in case this is the first occurrence of the table in the lock structure. */ |