Commit 76daa59f authored by unknown's avatar unknown

Search through options to find where the slow query log actually is.

parent 3c04f839
...@@ -40,6 +40,7 @@ unless (@ARGV) { ...@@ -40,6 +40,7 @@ unless (@ARGV) {
warn "basedir=$basedir\n" if $opt{v}; warn "basedir=$basedir\n" if $opt{v};
my $datadir = ($defaults =~ m/--datadir=(.*)/)[0]; my $datadir = ($defaults =~ m/--datadir=(.*)/)[0];
my $slowlog = ($defaults =~ m/--log-slow-queries=(.*)/)[0];
if (!$datadir or $opt{i}) { if (!$datadir or $opt{i}) {
# determine the datadir from the instances section of /etc/my.cnf, if any # determine the datadir from the instances section of /etc/my.cnf, if any
my $instances = `my_print_defaults instances`; my $instances = `my_print_defaults instances`;
...@@ -55,8 +56,13 @@ unless (@ARGV) { ...@@ -55,8 +56,13 @@ unless (@ARGV) {
warn "datadir=$datadir\n" if $opt{v}; warn "datadir=$datadir\n" if $opt{v};
} }
@ARGV = <$datadir/$opt{h}-slow.log>; if ( -f $slowlog ) {
die "Can't find '$datadir/$opt{h}-slow.log'\n" unless @ARGV; @ARGV = ($slowlog);
die "Can't find '$slowlog'\n" unless @ARGV;
} else {
@ARGV = <$datadir/$opt{h}-slow.log>;
die "Can't find '$datadir/$opt{h}-slow.log'\n" unless @ARGV;
}
} }
warn "\nReading mysql slow query log from @ARGV\n"; warn "\nReading mysql slow query log from @ARGV\n";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment