diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2010-10-10 17:18:11 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2010-10-10 17:18:11 +0300 |
| commit | 8d73ec2d1b01ca9d3d5ca55881f10fcd7e5f0015 (patch) | |
| tree | 220c965bb467b020a4db171d7803586f9ed22cea /mysql-test/lib/My/SafeProcess/safe_process.cc | |
| parent | ce4b468f7e36717298c16e7bafc562c89798e453 (diff) | |
| parent | e2dff1b5bdd860ae931d3ad6eb78225b81b8060a (diff) | |
| download | mariadb-git-8d73ec2d1b01ca9d3d5ca55881f10fcd7e5f0015.tar.gz | |
Merge 5.2->5.3
- Re-commit Monty's merge, partially fixed by Igor and SergeyP,
but still broken
Diffstat (limited to 'mysql-test/lib/My/SafeProcess/safe_process.cc')
| -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"); |