database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-05-05 21:16:22 +03:00
parent 36b8ac2c0d 2c3c851d2c
commit 7bcaa541aa
140 changed files with 1689 additions and 954 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/lib/My/SafeProcess/safe_process_win.cc
View File

@@ -206,7 +206,7 @@ int main(int argc, const char** argv )
} else {
if (strcmp(arg, "--verbose") == 0)
verbose++;
else if (strncmp(arg, "--parent-pid", 10) == 0)
else if (strncmp(arg, "--parent-pid", 12) == 0)
{
/* Override parent_pid with a value provided by user */
const char* start;