diff options
| author | Michael Widenius <monty@mysql.com> | 2008-10-15 00:23:33 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2008-10-15 00:23:33 +0300 |
| commit | 32718418811f909c1b70c0001fdd39e96c9031c0 (patch) | |
| tree | 34fdc323ef54f0f373956dc18c7c406d80078c54 /include/maria.h | |
| parent | 058916ae024baaf8a092e0130654f67ef7b9bcf1 (diff) | |
| download | mariadb-git-32718418811f909c1b70c0001fdd39e96c9031c0.tar.gz | |
Merging of changes from myisam -> maria missing in last 5.1 - 5.1->maria merge
MARIA_MAX_MSG_BUF -> HA_MAX_MSG_BUF
include/maria.h:
Remove MARIA_MAX_MSG_BUF; We are now using HA_MAX_MSG_BUF
Added maria_test_invalid_symlink
storage/maria/ha_maria.cc:
MARIA_MAX_MSG_BUF -> HA_MAX_MSG_BUF
storage/maria/ma_check.c:
Removed tab in string constant
Add extra argument to ma_open_datafile()
storage/maria/ma_create.c:
Set error number if table is in use
storage/maria/ma_open.c:
Added name argument to open functions for security check if filename is linked to another file in database directory
storage/maria/ma_static.c:
Default functions for checking if wrong symlink
storage/maria/maria_chk.c:
Add extra argument to _ma_open_datafile()
storage/maria/maria_def.h:
Add extra argument to _ma_open_datafile()
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 92f363e673e..37dbfe6833b 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 */ @@ -273,6 +272,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 */ |