diff options
| author | unknown <lars@dl145k.mysql.com> | 2006-06-28 16:44:54 +0200 |
|---|---|---|
| committer | unknown <lars@dl145k.mysql.com> | 2006-06-28 16:44:54 +0200 |
| commit | 517ac6283fc1bfdb4fb48862bb88168cefacd69e (patch) | |
| tree | 62549864f991184cfaaed66c7951e91eacc0a26d /include | |
| parent | e2bf3f0318b9b641127ff63c2f8e2b282554cf39 (diff) | |
| parent | 2a9b8802c3336da9a69a7ac44e5771e5f25cc9e5 (diff) | |
| download | mariadb-git-517ac6283fc1bfdb4fb48862bb88168cefacd69e.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
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 5d155eb20cc..2dc4053f70d 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -531,6 +531,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); @@ -604,6 +605,13 @@ extern File my_sopen(const char *path, int oflag, int shflag, int pmode); extern int check_if_legal_filename(const char *path); extern int check_if_legal_tablename(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 |