diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-02 08:44:17 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-02 08:44:17 +0200 |
| commit | ca091e6372c4d1b05d2338e878042c2914519a4e (patch) | |
| tree | 406c71091eb4fdf4409147d22e6749309f677e8e /mysql-test/lib/My | |
| parent | 28325b08633372cc343dfcbc41fe252020cf6e6e (diff) | |
| parent | d233fd14a39f9c583b85ffb03e42b5ea52e2f4c2 (diff) | |
| download | mariadb-git-ca091e6372c4d1b05d2338e878042c2914519a4e.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'mysql-test/lib/My')
| -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; |