diff options
| author | Alexey Botchkov <holyfoot@mysql.com> | 2008-08-23 07:47:43 +0500 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@mysql.com> | 2008-08-23 07:47:43 +0500 |
| commit | 491dc13898e37c04f02906554d29e4449515381c (patch) | |
| tree | ee21c0f34bb510966b5ed546cb41503309d9220a /include | |
| parent | 099a80d05a03f80a7310769f2b7b13f875ef24f9 (diff) | |
| parent | ec524d50a86b6fb75dc3dc5704fbed34568aa35c (diff) | |
| download | mariadb-git-491dc13898e37c04f02906554d29e4449515381c.tar.gz | |
merging
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 1 | ||||
| -rw-r--r-- | include/myisam.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 315d2f5c08d..60122eab94e 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -577,6 +577,7 @@ extern int my_close(File Filedes,myf MyFlags); extern File my_dup(File file, 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_is_symlink(const char *filename); 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, diff --git a/include/myisam.h b/include/myisam.h index e49446769dc..16175547367 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -256,6 +256,10 @@ extern my_bool myisam_flush,myisam_delay_key_write,myisam_single_user; extern my_off_t myisam_max_temp_length; extern ulong myisam_bulk_insert_tree_size, myisam_data_pointer_size; +/* usually used to check if a symlink points into the mysql data home */ +/* which is normally forbidden */ +extern int (*myisam_test_invalid_symlink)(const char *filename); + /* Prototypes for myisam-functions */ extern int mi_close(struct st_myisam_info *file); |