diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-09-06 02:48:51 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-09-06 02:48:51 +0300 |
| commit | 4ccb89bec074b8c00e2078540a791b68b39c655d (patch) | |
| tree | 098b7ca81f22efdec9551b92b3fc9bfa9f708b3a /mysql-test/lib/My | |
| parent | 72a26cb020fdbee7bba7612f55ab4e254092a7af (diff) | |
| parent | 0f3d4b2f76e4a0ce8573251715b143415149ba4d (diff) | |
| download | mariadb-git-4ccb89bec074b8c00e2078540a791b68b39c655d.tar.gz | |
Automatic merge
Diffstat (limited to 'mysql-test/lib/My')
| -rw-r--r-- | mysql-test/lib/My/SafeProcess/safe_process.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/lib/My/SafeProcess/safe_process.cc b/mysql-test/lib/My/SafeProcess/safe_process.cc index 71942565f8b..12b335ec444 100644 --- a/mysql-test/lib/My/SafeProcess/safe_process.cc +++ b/mysql-test/lib/My/SafeProcess/safe_process.cc @@ -160,7 +160,7 @@ int main(int argc, char* const argv[] ) signal(SIGCHLD, handle_signal); signal(SIGABRT, handle_abort); - sprintf(safe_process_name, "safe_process[%d]", (int) own_pid); + sprintf(safe_process_name, "safe_process[%ld]", (long) own_pid); message("Started"); |