Commit 07a4a6a9 authored by unknown's avatar unknown
Browse files

Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint 

into  qualinost.(none):/home/mtaylor/src/mysql-5.1-maint


mysys/typelib.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
parents 7788b06a 5fdbd481

scripts/mysqldumpslow.sh

+8 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ unless (@ARGV) { 
    warn "basedir=$basedir\n" if $opt{v};



    my $datadir = ($defaults =~ m/--datadir=(.*)/)[0];

    my $slowlog = ($defaults =~ m/--log-slow-queries=(.*)/)[0];

    if (!$datadir or $opt{i}) {

	# determine the datadir from the instances section of /etc/my.cnf, if any

	my $instances  = `my_print_defaults instances`;
@@ -55,9 +56,14 @@ unless (@ARGV) { 
	warn "datadir=$datadir\n" if $opt{v};

    }



    if ( -f $slowlog ) {

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