diff options
author | Sergei Golubchik <serg@mariadb.org> | 2020-05-27 23:10:55 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2020-05-27 23:10:55 +0200 |
commit | c2a7dffc573f311029ed4696fb5bd88e5efba752 (patch) | |
tree | 9f04258d84a42954afb0b8e36486fd6f303cf90d /mysql-test/lib/My/SafeProcess | |
parent | 520c3f69a6caed5524d3214a0339736d673c4c0c (diff) | |
parent | f20c63264ab4170fc8e45093042bd2e7272ce9fc (diff) | |
download | mariadb-git-10.0.tar.gz |
Merge tag 'mariadb-5.5.68' into 10.0bb-10.0-serg10.0
Diffstat (limited to 'mysql-test/lib/My/SafeProcess')
-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; |