mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
- Add system variables type_conv and conv_size. This addresses the eventual
conversion from TEXT to VARCHAR in PROXY and MYSQL tables. modified: storage/connect/ha_connect.cc storage/connect/myconn.cpp storage/connect/myconn.h storage/connect/myutil.cpp storage/connect/tabmysql.cpp storage/connect/tabutil.cpp - Add the xmap system variable addressing whether file mapping should be used to handle indexing. modified: storage/connect/CMakeLists.txt storage/connect/ha_connect.cc storage/connect/xindex.cpp storage/connect/xindex.h - Do take care of ~ in Linux version of _fullpath (not tested yet) modified: storage/connect/osutil.c
This commit is contained in:
@@ -16,6 +16,7 @@ my_bool CloseFileHandle(HANDLE h)
|
||||
#include <sys/stat.h>
|
||||
#include <ctype.h>
|
||||
#include <fcntl.h>
|
||||
#include <pwd.h>
|
||||
|
||||
extern FILE *debug;
|
||||
|
||||
@@ -176,8 +177,10 @@ char *_fullpath(char *absPath, const char *relPath, size_t maxLength)
|
||||
strncpy(absPath, relPath, maxLength);
|
||||
} else if(*relPath == '~') {
|
||||
// get the path to the home directory
|
||||
// Fixme
|
||||
strncpy(absPath, relPath, maxLength);
|
||||
struct passwd *pw = getpwuid_r(getuid());
|
||||
const char *homedir = pw->pw_dir;
|
||||
|
||||
strcat(strcat(strncpy(absPath, homedir, maxLength), "/"), relPath);
|
||||
} else {
|
||||
char buff[2*_MAX_PATH];
|
||||
|
||||
|
Reference in New Issue
Block a user