mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-10 17:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.4 into 10.5

Browse source
This commit is contained in:
Marko Mäkelä 2021-03-11 20:09:34 +02:00
commit a4b7232b2c
46 changed files with 632 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

13
extra/mariabackup/xtrabackup.cc
View file

@ -61,6 +61,10 @@ Street, Fifth Floor, Boston, MA 02110-1335 USA
#include <sys/resource.h>
#endif
#ifdef __APPLE__
# include "libproc.h"
#endif
#include <btr0sea.h>
#include <dict0priv.h>
@ -6243,8 +6247,9 @@ void handle_options(int argc, char **argv, char ***argv_server,
}
}
mariabackup_args.push_back(nullptr);
*argv_client= *argv_server= *argv_backup= &mariabackup_args[0];
int argc_backup= static_cast<int>(mariabackup_args.size());
int argc_backup= static_cast<int>(mariabackup_args.size() - 1);
int argc_client= argc_backup;
int argc_server= argc_backup;
@ -6707,6 +6712,12 @@ static int get_exepath(char *buf, size_t size, const char *argv0)
ssize_t ret = readlink("/proc/self/exe", buf, size-1);
if(ret > 0)
return 0;
#elif defined(__APPLE__)
size_t ret = proc_pidpath(getpid(), buf, static_cast<uint32_t>(size));
if (ret > 0) {
buf[ret] = 0;
return 0;
}
#endif
return my_realpath(buf, argv0, 0);