summaryrefslogtreecommitdiff
path: root/merge/_locking.c
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-08-22 01:45:07 +0300
committermonty@hundin.mysql.fi <>2001-08-22 01:45:07 +0300
commit733f865f54e297bf512f10ec0631342303164b25 (patch)
tree32f2629127dea884d1930817179e72d2076be756 /merge/_locking.c
parent063a1a6557ad2c501f4da9a47e633fb191ee2e00 (diff)
downloadmariadb-git-733f865f54e297bf512f10ec0631342303164b25.tar.gz
Fixes for OS2.
Fix bug in isamlog Add argument types to function declarations.
Diffstat (limited to 'merge/_locking.c')
-rw-r--r--merge/_locking.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/merge/_locking.c b/merge/_locking.c
index f90b41e2375..81582da1312 100644
--- a/merge/_locking.c
+++ b/merge/_locking.c
@@ -20,9 +20,7 @@
#include "mrgdef.h"
-int mrg_lock_database(info,lock_type)
-MRG_INFO *info;
-int lock_type;
+int mrg_lock_database(MRG_INFO *info,int lock_type)
{
int error,new_error;
MRG_TABLE *file;