diff options
| author | He Zhenxing <hezx@mysql.com> | 2008-09-06 08:51:17 +0800 |
|---|---|---|
| committer | He Zhenxing <hezx@mysql.com> | 2008-09-06 08:51:17 +0800 |
| commit | b17458dcc14882dcb2565bcbb92115ed786fe7c1 (patch) | |
| tree | 81eaef221aa476a0279c43f5e5c6df9c91924e44 /include | |
| parent | d0edf322306221f2e662a54a9feecc78378d6dfe (diff) | |
| parent | d70d171ceef259920d975fa2ddccaa6a41ba91fe (diff) | |
| download | mariadb-git-b17458dcc14882dcb2565bcbb92115ed786fe7c1.tar.gz | |
Merge 5.1 main -> 5.1-rpl
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 3 | ||||
| -rw-r--r-- | include/myisam.h | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 7e6a51ff21f..60122eab94e 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -246,7 +246,7 @@ extern int NEAR my_umask, /* Default creation mask */ NEAR my_safe_to_handle_signal, /* Set when allowed to SIGTSTP */ NEAR my_dont_interrupt; /* call remember_intr when set */ extern my_bool NEAR mysys_uses_curses, my_use_symdir; -extern ulong sf_malloc_cur_memory, sf_malloc_max_memory; +extern size_t sf_malloc_cur_memory, sf_malloc_max_memory; extern ulong my_default_record_cache_size; extern my_bool NEAR my_disable_locking,NEAR my_disable_async_io, @@ -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); |