database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Automatic merge

Browse Source
This commit is contained in:
Michael Widenius
2010-09-06 02:48:51 +03:00
parent 72a26cb020 0f3d4b2f76
commit 4ccb89bec0
262 changed files with 4032 additions and 1829 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/lib/My/SafeProcess/safe_process.cc
View File

@ -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");

2
mysql-test/lib/v1/mysql-test-run.pl
View File

@ -2959,7 +2959,7 @@ sub run_benchmarks ($) {
if ( ! $benchmark )
{
mtr_add_arg($args, "--log");
mtr_add_arg($args, "--general-log");
mtr_run("$glob_mysql_bench_dir/run-all-tests", $args, "", "", "", "");
# FIXME check result code?!
}