database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '5.5' into 10.1

Browse Source
This commit is contained in:
Oleksandr Byelkin
2020-04-30 17:36:41 +02:00
parent de8c9b538f 6a31aea5a1
commit 23c6fb3e62
20 changed files with 372 additions and 121 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;