1
#! /bin/sh /usr/share/dpatch/dpatch-run
4
diff -Naur mysql-dfsg-5.0-5.0.45.orig/scripts/mysqldumpslow.sh mysql-dfsg-5.0-5.0.45/scripts/mysqldumpslow.sh
5
--- mysql-dfsg-5.0-5.0.45.orig/scripts/mysqldumpslow.sh 2007-07-04 09:06:41.000000000 -0400
6
+++ mysql-dfsg-5.0-5.0.45/scripts/mysqldumpslow.sh 2008-02-04 08:04:14.000000000 -0500
8
$opt{'help'} and usage();
11
- my $defaults = `my_print_defaults mysqld`;
12
+ my $defaults = `my_print_defaults mysqld -c -c /etc/mysql/my.cnf`;
13
my $basedir = ($defaults =~ m/--basedir=(.*)/)[0]
14
- or die "Can't determine basedir from 'my_print_defaults mysqld' output: $defaults";
15
+ or die "Can't determine basedir from 'my_print_defaults mysqld' -c -c /etc/mysql/my.cnf output: $defaults";
16
warn "basedir=$basedir\n" if $opt{v};
18
my $datadir = ($defaults =~ m/--datadir=(.*)/)[0];
19
- my $slowlog = ($defaults =~ m/--log-slow-queries=(.*)/)[0];
20
+ my $slowlog = ($defaults =~ m/--log[-_]slow[-_]queries=(.*)/)[0];
21
if (!$datadir or $opt{i}) {
22
# determine the datadir from the instances section of /etc/my.cnf, if any
23
my $instances = `my_print_defaults instances`;