diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-04-30 17:36:41 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-04-30 17:36:41 +0200 |
| commit | 23c6fb3e6231b8939331e2d9f157092f24ed8f4f (patch) | |
| tree | ff0f65edbc442afcc3f3a3159753c8a2284d9c95 /mysql-test/lib | |
| parent | de8c9b538f7e77f18470ccfcacf723a9c2e31b38 (diff) | |
| parent | 6a31aea5a1a50614af3a6591a085dc47061cdd0e (diff) | |
| download | mariadb-git-23c6fb3e6231b8939331e2d9f157092f24ed8f4f.tar.gz | |
Merge branch '5.5' into 10.1
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/My/SafeProcess/safe_process_win.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/lib/My/SafeProcess/safe_process_win.cc b/mysql-test/lib/My/SafeProcess/safe_process_win.cc index 7d81bf1a1b4..4dd4e24f30d 100644 --- a/mysql-test/lib/My/SafeProcess/safe_process_win.cc +++ b/mysql-test/lib/My/SafeProcess/safe_process_win.cc @@ -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; |