summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorlars@mysql.com <>2006-06-29 14:03:41 +0200
committerlars@mysql.com <>2006-06-29 14:03:41 +0200
commit0707d4753f2a1b093c275b58e14c62b821c75b11 (patch)
treec345f3d52ceb3515033b52f0ea943e15f67986d7 /include
parentc6d9b5c551e15dd61c02e261e7176e62c30d0edc (diff)
parent6036c30b5711953bbb984d82839f990c1868aff0 (diff)
downloadmariadb-git-0707d4753f2a1b093c275b58e14c62b821c75b11.tar.gz
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into mysql.com:/users/lthalmann/bkroot/mysql-5.0-release
Diffstat (limited to 'include')
-rw-r--r--include/my_sys.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h
index cbd7c79fa11..b00b59c4779 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -541,6 +541,7 @@ typedef int (*Process_option_func)(void *ctx, const char *group_name,
#include <my_alloc.h>
+
/* Prototypes for mysys and my_func functions */
extern int my_copy(const char *from,const char *to,myf MyFlags);
@@ -613,6 +614,13 @@ extern File my_sopen(const char *path, int oflag, int shflag, int pmode);
#endif
extern int check_if_legal_filename(const char *path);
+#if defined(__WIN__) && defined(__NT__)
+extern int nt_share_delete(const char *name,myf MyFlags);
+#define my_delete_allow_opened(fname,flags) nt_share_delete((fname),(flags))
+#else
+#define my_delete_allow_opened(fname,flags) my_delete((fname),(flags))
+#endif
+
#ifndef TERMINATE
extern void TERMINATE(FILE *file);
#endif