diff options
| author | unknown <monty@work.mysql.com> | 2001-05-31 12:56:05 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-05-31 12:56:05 +0200 |
| commit | e6ecbfd629bf92c84f270119405f4796464e7f4e (patch) | |
| tree | 7fc3c8f38fbab4a3cef1388c3bc2e53b0455c75c /include/my_sys.h | |
| parent | a14542a61fbaabf30a2735a74401e4cd2734314d (diff) | |
| parent | 8c8244918fc37bb25656a5f8b451a362e4b16577 (diff) | |
| download | mariadb-git-e6ecbfd629bf92c84f270119405f4796464e7f4e.tar.gz | |
merge
BitKeeper/triggers/post-commit:
Auto merged
acinclude.m4:
Auto merged
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_table.cc:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index b5d59d2e801..dc4eff7bda5 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -62,6 +62,8 @@ extern int NEAR my_errno; /* Last error in mysys */ #define MY_DONT_CHECK_FILESIZE 128 /* Option to init_io_cache() */ #define MY_LINK_WARNING 32 /* my_redel() gives warning if links */ #define MY_COPYTIME 64 /* my_redel() copys time */ +#define MY_DELETE_OLD 256 /* my_create_with_symlink() */ +#define MY_RESOLVE_LINK 128 /* my_realpath(); Only resolve links */ #define MY_HOLD_ORIGINAL_MODES 128 /* my_copy() holds to file modes */ #define MY_REDEL_MAKE_BACKUP 256 #define MY_SEEK_NOT_DONE 32 /* my_lock may have to do a seek */ @@ -382,6 +384,12 @@ extern File my_create(const char *FileName,int CreateFlags, int AccsesFlags, myf MyFlags); extern int my_close(File Filedes,myf MyFlags); extern int my_mkdir(const char *dir, int Flags, myf MyFlags); +extern int my_readlink(char *to, const char *filename, myf MyFlags); +extern int my_realpath(char *to, const char *filename, myf MyFlags); +extern File my_create_with_symlink(const char *linkname, const char *filename, + int createflags, int access_flags, + myf MyFlags); +extern int my_symlink(const char *content, const char *linkname, myf MyFlags); extern uint my_read(File Filedes,byte *Buffer,uint Count,myf MyFlags); extern uint my_pread(File Filedes,byte *Buffer,uint Count,my_off_t offset, myf MyFlags); @@ -432,8 +440,14 @@ extern int my_redel(const char *from, const char *to, int MyFlags); extern int my_copystat(const char *from, const char *to, int MyFlags); extern my_string my_filename(File fd); +#ifndef THREAD extern void dont_break(void); extern void allow_break(void); +#else +#define dont_break() +#define allow_break() +#endif + extern void my_remember_signal(int signal_number,sig_handler (*func)(int)); extern void caseup(my_string str,uint length); extern void casedn(my_string str,uint length); |