percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-12 14:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only cat cnf file > mysql-config-file if it exists.

Browse Source
This commit is contained in:
Daniel Nichter
2012-10-24 12:43:26 -06:00
parent a94605c825
commit b6072ab011
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/bash/collect_mysql_info.sh
View File

@@ -234,7 +234,7 @@ collect_mysql_info () {
local port="$(get_var port "$dir/mysql-variables")" local port="$(get_var port "$dir/mysql-variables")"
local cnf_file="$(find_my_cnf_file "$dir/mysqld-instances" ${port})" local cnf_file="$(find_my_cnf_file "$dir/mysqld-instances" ${port})"
cat "$cnf_file" > "$dir/mysql-config-file" [ -e "$cnf_file" ] && cat "$cnf_file" > "$dir/mysql-config-file"
local pid_file="$(get_var "pid_file" "$dir/mysql-variables")" local pid_file="$(get_var "pid_file" "$dir/mysql-variables")"
local pid_file_exists="" local pid_file_exists=""

2
t/lib/bash/collect_mysql_info.sh
View File

@@ -28,7 +28,7 @@ wait
file_count=$(ls "$p" | wc -l) file_count=$(ls "$p" | wc -l)
is $file_count 14 "Creates the correct number of files (without --databases)" is $file_count 13 "Creates the correct number of files (without --databases)"
awk '{print $1}' "$p/mysqld-instances" > "$PT_TMPDIR/collect_mysqld_instances1.test" awk '{print $1}' "$p/mysqld-instances" > "$PT_TMPDIR/collect_mysqld_instances1.test"
pids="$(_pidof mysqld)" pids="$(_pidof mysqld)"