summaryrefslogtreecommitdiff
path: root/myisammrg
diff options
context:
space:
mode:
authorserg@serg.mysql.com <>2002-06-22 17:44:04 +0000
committerserg@serg.mysql.com <>2002-06-22 17:44:04 +0000
commit076fc1a62105f9b15ad94a534614bd2dccf612e1 (patch)
tree56de9b3e8d8561473a860e0998e0eb6ae3aa2b26 /myisammrg
parent5a54f8625eca05b010aac8d8ba2fc10eba905379 (diff)
downloadmariadb-git-076fc1a62105f9b15ad94a534614bd2dccf612e1.tar.gz
myrg_open.c:
comment fixed, bad flag hack removed
Diffstat (limited to 'myisammrg')
-rw-r--r--myisammrg/myrg_open.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/myisammrg/myrg_open.c b/myisammrg/myrg_open.c
index 668744442a6..9360f582958 100644
--- a/myisammrg/myrg_open.c
+++ b/myisammrg/myrg_open.c
@@ -23,10 +23,10 @@
#include "mrg_static.c"
#endif
-/*
+/*
open a MyISAM MERGE table
- if handle_locking is 0 then exit with error if some database is locked
- if handle_locking is 1 then wait if database is locked
+ if handle_locking is 0 then exit with error if some table is locked
+ if handle_locking is 1 then wait if table is locked
*/
@@ -78,7 +78,7 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking)
sizeof(name_buff)-1-dir_length));
VOID(cleanup_dirname(buff,name_buff));
}
- if (!(isam=mi_open(buff,mode,test(handle_locking))))
+ if (!(isam=mi_open(buff,mode,(handle_locking?HA_OPEN_WAIT_IF_LOCKED:0))))
goto err;
files++;
last_isam=isam;