[innotop/f20: 2/7] add patch

Fabio Alessandro Locati fale at fedoraproject.org
Wed Aug 20 22:38:51 UTC 2014 

commit 5189c662086556cb009e00cf4e02863b2c6b2240
Author: lbazan <lbazan at fedoraproject.org>
Date:   Mon Aug 11 21:06:00 2014 -0500

    add patch

 innotop-fix-mariadb10.patch |  273 +++++++++++++++++++++++++++++++++++++++++++
 innotop.spec                |    4 +-
 2 files changed, 275 insertions(+), 2 deletions(-)
---
diff --git a/innotop-fix-mariadb10.patch b/innotop-fix-mariadb10.patch
new file mode 100644
index 0000000..31401fa
--- /dev/null
+++ b/innotop-fix-mariadb10.patch
@@ -0,0 +1,273 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
+<head>
+<title>innotop.git - innotop</title>
+<meta name='generator' content='cgit v0.10.1'/>
+<meta name='robots' content='index, nofollow'/>
+<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/>
+<link rel='shortcut icon' href='/favicon.ico'/>
+<link rel='alternate' title='Atom feed' href='http://pkgs.fedoraproject.org/cgit/innotop.git/atom/innotop-fix-mariadb10.patch?h=master' type='application/atom+xml'/>
+</head>
+<body>
+<div id='cgit'><table id='header'>
+<tr>
+<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td>
+<td class='main'><a href='/cgit/'>index</a> : <a title='innotop.git' href='/cgit/innotop.git/'>innotop.git</a></td><td class='form'><form method='get' action=''>
+<select name='h' onchange='this.form.submit();'>
+<option value='el4'>el4</option>
+<option value='el5'>el5</option>
+<option value='el6'>el6</option>
+<option value='epel7'>epel7</option>
+<option value='f10'>f10</option>
+<option value='f11'>f11</option>
+<option value='f12'>f12</option>
+<option value='f13'>f13</option>
+<option value='f14'>f14</option>
+<option value='f15'>f15</option>
+<option value='f16'>f16</option>
+<option value='f17'>f17</option>
+<option value='f18'>f18</option>
+<option value='f19'>f19</option>
+<option value='f20'>f20</option>
+<option value='f21'>f21</option>
+<option value='f7'>f7</option>
+<option value='f8'>f8</option>
+<option value='f9'>f9</option>
+<option value='fc6'>fc6</option>
+<option value='master' selected='selected'>master</option>
+</select> <input type='submit' name='' value='switch'/></form></td></tr>
+<tr><td class='sub'>innotop</td><td class='sub right'>Jesse Keating</td></tr></table>
+<table class='tabs'><tr><td>
+<a href='/cgit/innotop.git/'>summary</a><a href='/cgit/innotop.git/refs/'>refs</a><a href='/cgit/innotop.git/log/innotop-fix-mariadb10.patch'>log</a><a class='active' href='/cgit/innotop.git/tree/innotop-fix-mariadb10.patch'>tree</a><a href='/cgit/innotop.git/commit/innotop-fix-mariadb10.patch'>commit</a><a href='/cgit/innotop.git/diff/innotop-fix-mariadb10.patch'>diff</a><a href='/cgit/innotop.git/stats/innotop-fix-mariadb10.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/innotop.git/log/innotop-fix-mariadb10.patch'>
+<select name='qt'>
+<option value='grep'>log msg</option>
+<option value='author'>author</option>
+<option value='committer'>committer</option>
+<option value='range'>range</option>
+</select>
+<input class='txt' type='text' size='10' name='q' value=''/>
+<input type='submit' value='search'/>
+</form>
+</td></tr></table>
+<div class='path'>path: <a href='/cgit/innotop.git/tree/'>root</a>/<a href='/cgit/innotop.git/tree/innotop-fix-mariadb10.patch'>innotop-fix-mariadb10.patch</a></div><div class='content'>blob: 0f98f1e7efcb811ae9f0ec5750387f1bfff0df13 (<a href='/cgit/innotop.git/plain/innotop-fix-mariadb10.patch'>plain</a>)
+<table summary='blob content' class='blob'>
+<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
+<a id='n2' href='#n2'>2</a>
+<a id='n3' href='#n3'>3</a>
+<a id='n4' href='#n4'>4</a>
+<a id='n5' href='#n5'>5</a>
+<a id='n6' href='#n6'>6</a>
+<a id='n7' href='#n7'>7</a>
+<a id='n8' href='#n8'>8</a>
+<a id='n9' href='#n9'>9</a>
+<a id='n10' href='#n10'>10</a>
+<a id='n11' href='#n11'>11</a>
+<a id='n12' href='#n12'>12</a>
+<a id='n13' href='#n13'>13</a>
+<a id='n14' href='#n14'>14</a>
+<a id='n15' href='#n15'>15</a>
+<a id='n16' href='#n16'>16</a>
+<a id='n17' href='#n17'>17</a>
+<a id='n18' href='#n18'>18</a>
+<a id='n19' href='#n19'>19</a>
+<a id='n20' href='#n20'>20</a>
+<a id='n21' href='#n21'>21</a>
+<a id='n22' href='#n22'>22</a>
+<a id='n23' href='#n23'>23</a>
+<a id='n24' href='#n24'>24</a>
+<a id='n25' href='#n25'>25</a>
+<a id='n26' href='#n26'>26</a>
+<a id='n27' href='#n27'>27</a>
+<a id='n28' href='#n28'>28</a>
+<a id='n29' href='#n29'>29</a>
+<a id='n30' href='#n30'>30</a>
+<a id='n31' href='#n31'>31</a>
+<a id='n32' href='#n32'>32</a>
+<a id='n33' href='#n33'>33</a>
+<a id='n34' href='#n34'>34</a>
+<a id='n35' href='#n35'>35</a>
+<a id='n36' href='#n36'>36</a>
+<a id='n37' href='#n37'>37</a>
+<a id='n38' href='#n38'>38</a>
+<a id='n39' href='#n39'>39</a>
+<a id='n40' href='#n40'>40</a>
+<a id='n41' href='#n41'>41</a>
+<a id='n42' href='#n42'>42</a>
+<a id='n43' href='#n43'>43</a>
+<a id='n44' href='#n44'>44</a>
+<a id='n45' href='#n45'>45</a>
+<a id='n46' href='#n46'>46</a>
+<a id='n47' href='#n47'>47</a>
+<a id='n48' href='#n48'>48</a>
+<a id='n49' href='#n49'>49</a>
+<a id='n50' href='#n50'>50</a>
+<a id='n51' href='#n51'>51</a>
+<a id='n52' href='#n52'>52</a>
+<a id='n53' href='#n53'>53</a>
+<a id='n54' href='#n54'>54</a>
+<a id='n55' href='#n55'>55</a>
+<a id='n56' href='#n56'>56</a>
+<a id='n57' href='#n57'>57</a>
+<a id='n58' href='#n58'>58</a>
+<a id='n59' href='#n59'>59</a>
+<a id='n60' href='#n60'>60</a>
+<a id='n61' href='#n61'>61</a>
+<a id='n62' href='#n62'>62</a>
+<a id='n63' href='#n63'>63</a>
+<a id='n64' href='#n64'>64</a>
+<a id='n65' href='#n65'>65</a>
+<a id='n66' href='#n66'>66</a>
+<a id='n67' href='#n67'>67</a>
+<a id='n68' href='#n68'>68</a>
+<a id='n69' href='#n69'>69</a>
+<a id='n70' href='#n70'>70</a>
+<a id='n71' href='#n71'>71</a>
+<a id='n72' href='#n72'>72</a>
+<a id='n73' href='#n73'>73</a>
+<a id='n74' href='#n74'>74</a>
+<a id='n75' href='#n75'>75</a>
+<a id='n76' href='#n76'>76</a>
+<a id='n77' href='#n77'>77</a>
+<a id='n78' href='#n78'>78</a>
+<a id='n79' href='#n79'>79</a>
+<a id='n80' href='#n80'>80</a>
+<a id='n81' href='#n81'>81</a>
+<a id='n82' href='#n82'>82</a>
+<a id='n83' href='#n83'>83</a>
+<a id='n84' href='#n84'>84</a>
+<a id='n85' href='#n85'>85</a>
+<a id='n86' href='#n86'>86</a>
+<a id='n87' href='#n87'>87</a>
+<a id='n88' href='#n88'>88</a>
+<a id='n89' href='#n89'>89</a>
+<a id='n90' href='#n90'>90</a>
+<a id='n91' href='#n91'>91</a>
+<a id='n92' href='#n92'>92</a>
+<a id='n93' href='#n93'>93</a>
+<a id='n94' href='#n94'>94</a>
+<a id='n95' href='#n95'>95</a>
+<a id='n96' href='#n96'>96</a>
+<a id='n97' href='#n97'>97</a>
+<a id='n98' href='#n98'>98</a>
+<a id='n99' href='#n99'>99</a>
+<a id='n100' href='#n100'>100</a>
+<a id='n101' href='#n101'>101</a>
+<a id='n102' href='#n102'>102</a>
+<a id='n103' href='#n103'>103</a>
+<a id='n104' href='#n104'>104</a>
+<a id='n105' href='#n105'>105</a>
+<a id='n106' href='#n106'>106</a>
+</pre></td>
+<td class='lines'><pre><code>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-&gt;{'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-&gt;{'fulltext'};
++    return 0 unless $fulltext;
++@@ -898,7 +898,12 @@
++    my ( $ts ) = $fulltext =~ m/^$s$/m;
++    return 0 unless $ts;
++ 
++-   $dl-&gt;{'ts'} = [ parse_innodb_timestamp( $ts ) ];
+++   if ( ($mysqlversion =~ /^5\.6/) || ($mysqlversion =~ /^10\.0/) ) {
+++      $dl-&gt;{'ts'} = [ parse_innodb_timestamp_56( $ts ) ];
+++   }
+++   else {
+++      $dl-&gt;{'ts'} = [ parse_innodb_timestamp( $ts ) ];
+++   }
++    $dl-&gt;{'timestring'} = ts_to_string($dl-&gt;{'ts'});
++    $dl-&gt;{'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}-&gt;{$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 { $_ =&gt; 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) : () ] );
+
+</code></pre></td></tr></table>
+</div> <!-- class=content -->
+<div class='footer'>generated  by cgit v0.10.1 at 2014-08-12 02:05:24 (GMT)</div>
+</div> <!-- id=cgit -->
+</body>
+</html>
diff --git a/innotop.spec b/innotop.spec
index c1c23ab..7987063 100644
--- a/innotop.spec
+++ b/innotop.spec
@@ -54,8 +54,8 @@ make test
 * Wed Aug 20 2014 Fabio Alessandro Locati <fabiolocati at gmail.com> - 1.9.1-4
 - Fix previously bad applied patch
 
-* Mon Aug 11 2014 Fabio Alessandro Locati <fabiolocati at gmail.com> - 1.9.1-3
-- Add patch taken from Issue 93 upstream to fix problems with MariaDB 10
+* Mon Aug 11 2014 Luis Bazan <lbazan at fedoraproject.org> - 1.9.1-3
+- add patch BZ# 925707
 
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

More information about the scm-commits mailing list