diff options
author | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
commit | 0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch) | |
tree | bdf0738c29dc1f57fbfba3a1754524e238f15b52 /storage/maria/ma_info.c | |
parent | 37f87d73ae8dc6c30594867b40a5d70159acf63c (diff) | |
download | mariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz |
lots of post-merge changes
Diffstat (limited to 'storage/maria/ma_info.c')
-rw-r--r-- | storage/maria/ma_info.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/ma_info.c b/storage/maria/ma_info.c index 1bbfa3cbf7e..6392da31298 100644 --- a/storage/maria/ma_info.c +++ b/storage/maria/ma_info.c @@ -43,7 +43,7 @@ int maria_status(MARIA_HA *info, register MARIA_INFO *x, uint flag) if (!(flag & HA_STATUS_NO_LOCK)) { pthread_mutex_lock(&share->intern_lock); - VOID(_ma_readinfo(info,F_RDLCK,0)); + _ma_readinfo(info,F_RDLCK,0); fast_ma_writeinfo(info); pthread_mutex_unlock(&share->intern_lock); } |