Attachment 925707 Details for Bug 1128704 – Patch to fix the problem

[patch] Patch to fix the problem

innotop-pkg-fix-mariadb-10.patch (text/plain), 4.39 KB, created by Fabio Alessandro Locati on 2014-08-11 11:34:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fabio Alessandro Locati

Created: 2014-08-11 11:34:41 UTC

Size: 4.39 KB

patch

obsolete

>diff --git a/innotop-fix-mariadb10.patch b/innotop-fix-mariadb10.patch
>new file mode 100644
>index 0000000..9c28d6a
>--- /dev/null
>+++ b/innotop-fix-mariadb10.patch
>@@ -0,0 +1,99 @@
>+--- innotop.orig	2014-04-01 16:36:39.000000000 -0500
>++++ innotop	2014-05-14 18:58:59.000000000 -0500
>+@@ -470,7 +470,7 @@
>+    # too many locks to print, the output might be truncated)
>+ 
>+    my $time_text;
>+-   if ( $mysqlversion =~ /^5\.6/ ) {
>++   if ( ($mysqlversion =~ /^5\.6/) || ($mysqlversion =~ /^10\.0/) ) {
>+       ( $time_text ) = $fulltext =~ m/^([0-9-]* [0-9:]*) [0-9a-f]* INNODB MONITOR OUTPUT/m;
>+       $innodb_data{'ts'} = [ parse_innodb_timestamp_56( $time_text ) ];
>+    } else {
>+@@ -638,7 +638,7 @@
>+    return 0 unless $fulltext;
>+ 
>+    my ( $ts, $type );
>+-   if ( $mysqlversion =~ /^5.6/ ) {
>++   if ( ($mysqlversion =~ /^5.6/) || ($mysqlversion =~ /^10.0/) ) {
>+       ( $ts, $type ) = $fulltext =~ m/^([0-9-]* [0-9:]*)\s[0-9a-f]*\s+(\w+)/m;
>+       $section->{'ts'} = [ parse_innodb_timestamp_56( $ts ) ];
>+    } else {
>+@@ -890,7 +890,7 @@
>+ }
>+ 
>+ sub parse_dl_section {
>+-   my ( $dl, $complete, $debug, $full ) = @_;
>++   my ( $dl, $complete, $debug, $full, $mysqlversion ) = @_;
>+    return unless $dl;
>+    my $fulltext = $dl->{'fulltext'};
>+    return 0 unless $fulltext;
>+@@ -898,7 +898,12 @@
>+    my ( $ts ) = $fulltext =~ m/^$s$/m;
>+    return 0 unless $ts;
>+ 
>+-   $dl->{'ts'} = [ parse_innodb_timestamp( $ts ) ];
>++   if ( ($mysqlversion =~ /^5\.6/) || ($mysqlversion =~ /^10\.0/) ) {
>++      $dl->{'ts'} = [ parse_innodb_timestamp_56( $ts ) ];
>++   }
>++   else {
>++      $dl->{'ts'} = [ parse_innodb_timestamp( $ts ) ];
>++   }
>+    $dl->{'timestring'} = ts_to_string($dl->{'ts'});
>+    $dl->{'txns'} = {};
>+ 
>+@@ -5116,6 +5121,7 @@
>+ sub display_B {
>+    my @display_lines;
>+    my @cxns = get_connections();
>++   get_status_info(@cxns);
>+    get_innodb_status(\@cxns);
>+ 
>+    my @buffer_pool;
>+@@ -5226,6 +5232,7 @@
>+ sub display_D {
>+    my @display_lines;
>+    my @cxns = get_connections();
>++   get_status_info(@cxns);
>+    get_innodb_status(\@cxns);
>+ 
>+    my @deadlock_transactions;
>+@@ -5290,6 +5297,7 @@
>+ sub display_F {
>+    my @display_lines;
>+    my ( $cxn ) = get_connections();
>++   get_status_info($cxn);
>+    get_innodb_status([$cxn]);
>+    my $innodb_status = $vars{$cxn}->{$clock};
>+ 
>+@@ -5324,6 +5332,7 @@
>+ sub display_I {
>+    my @display_lines;
>+    my @cxns = get_connections();
>++   get_status_info(@cxns);
>+    get_innodb_status(\@cxns);
>+ 
>+    my @io_threads;
>+@@ -5425,6 +5434,7 @@
>+ sub display_L {
>+    my @display_lines;
>+    my @cxns = get_connections();
>++   get_status_info(@cxns);
>+    get_innodb_status(\@cxns);
>+ 
>+    my @innodb_locks;
>+@@ -5635,6 +5645,7 @@
>+ sub display_R {
>+    my @display_lines;
>+    my @cxns = get_connections();
>++   get_status_info(@cxns);
>+    get_innodb_status(\@cxns);
>+ 
>+    my @row_operations;
>+@@ -5706,6 +5717,7 @@
>+    my %wanted  = map { $_ => 1 } @visible;
>+ 
>+    my @cxns = get_connections();
>++   get_status_info(@cxns);
>+ 
>+    # If the header is to be shown, buffer pool data is required.
>+    get_innodb_status( \@cxns, [ $wanted{t_header} ? qw(bp) : () ] );
>diff --git a/innotop.spec b/innotop.spec
>index a21043f..f61f8c2 100644
>--- a/innotop.spec
>+++ b/innotop.spec
>@@ -1,6 +1,6 @@
> Name:           innotop
> Version:        1.9.1
>-Release:        2%{?dist}
>+Release:        3%{?dist}
> Summary:        A MySQL and InnoDB monitor program
> 
> Group:          Applications/Databases
>@@ -8,6 +8,8 @@ License:        GPLv2+ or Artistic
> URL:            http://code.google.com/p/innotop
> Source0:        http://innotop.googlecode.com/files/%{name}-%{version}.tar.gz
> 
>+Patch:		innotop-fix-mariadb10.patch
>+
> BuildArch:      noarch
> BuildRequires:  perl(Test::Simple) perl(DBI) perl(ExtUtils::MakeMaker) perl(Term::ReadKey) perl(DBD::mysql)
> Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) perl(Term::ReadKey) perl(DBD::mysql)
>@@ -20,6 +22,7 @@ SHOW ENGINE INNODB STATUS, among other things.
> 
> %prep
> %setup -q
>+%patch
> 
> %build
> %{__perl} Makefile.PL INSTALLDIRS=vendor
>@@ -43,6 +46,9 @@ make test
> %{_mandir}/man1/innotop.1*
> 
> %changelog
>+* Mon Aug 11 2014 Fabio Alessandro Locati <fabiolocati@gmail.com> - 1.9.1-3
>+- Add patch taken from Issue 93 upstream to fix problems with MariaDB 10
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.1-2
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
>

Actions: View | Diff

Attachments on bug 1128704: 925707