diff options
| author | unknown <lars@mysql.com> | 2006-06-29 14:03:41 +0200 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2006-06-29 14:03:41 +0200 |
| commit | 82f5656af39c3b73afb0a9531cedb11e0868b3cb (patch) | |
| tree | c345f3d52ceb3515033b52f0ea943e15f67986d7 /include | |
| parent | 89a55ee411db141158a1853253b9c71ebe0137b7 (diff) | |
| parent | 11d38c1d44a4e070b3da94a6ea8cc3c5fc06e40b (diff) | |
| download | mariadb-git-82f5656af39c3b73afb0a9531cedb11e0868b3cb.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into mysql.com:/users/lthalmann/bkroot/mysql-5.0-release
include/my_sys.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/log.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 8 |
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 |