diff options
author | Michael Widenius <monty@mysql.com> | 2009-01-12 13:12:00 +0200 |
---|---|---|
committer | Michael Widenius <monty@mysql.com> | 2009-01-12 13:12:00 +0200 |
commit | dd5b9fc6cd620d0826a10e184c0082880f97513d (patch) | |
tree | 94c74d793c73010314d54c106176bdbf89f2b87f /include/maria.h | |
parent | 7eda7f1337e633d473e432e9c74b3d2383b2f938 (diff) | |
parent | 7dc83c50436a36280e99f9c71006b05452d0b9fe (diff) | |
download | mariadb-git-dd5b9fc6cd620d0826a10e184c0082880f97513d.tar.gz |
Merge with base MySQL-5.1-maria
Diffstat (limited to 'include/maria.h')
-rw-r--r-- | include/maria.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/maria.h b/include/maria.h index 0f70e9ce28d..e230213963d 100644 --- a/include/maria.h +++ b/include/maria.h @@ -43,7 +43,6 @@ extern "C" { #define MARIA_MAX_KEY MAX_INDEXES /* Max allowed keys */ #endif -#define MARIA_MAX_MSG_BUF 1024 /* used in CHECK TABLE, REPAIR TABLE */ #define MARIA_NAME_IEXT ".MAI" #define MARIA_NAME_DEXT ".MAD" /* Max extra space to use when sorting keys */ @@ -274,6 +273,12 @@ extern my_off_t maria_max_temp_length; extern ulong maria_bulk_insert_tree_size, maria_data_pointer_size; extern PAGECACHE maria_pagecache_var, *maria_pagecache; extern MY_TMPDIR *maria_tmpdir; +/* + This is used to check if a symlink points into the mysql data home, + which is normally forbidden as it can be used to get access to + not privileged data +*/ +extern int (*maria_test_invalid_symlink)(const char *filename); /* Prototypes for maria-functions */ |