Add in a way to specify if you are using the old table structure or the new table structure for the history tables

Author: kormoc

config.php.example

@@ -7,6 +7,22 @@ $settings['title'] = null;
 // Syntax highlight queries?
 $settings['sqlColor'] = true;
 
+// Sometime in the past, percona changed the format
+// that slow queries dumped out
+// This causes the tmp disk table/disk filesort
+// fields to be named incorrectly. The old names were
+
+// Disk_tmp_table_cnt Disk_tmp_table_sum
+// Disk_filesort_cnt Disk_filesort_sum
+
+// and the new names are
+
+// Tmp_table_on_disk_cnt Tmp_table_on_disk_sum
+// Filesort_on_disk_cnt Filesort_on_disk_sum
+
+// You can use this setting to swap between the column names
+$settings['oldSlowQueryFormat'] = false;
+
 // What columns are visible by default
 /*
 $settings['defaultColumnVis']['Checksum']      = true;

init.php

@@ -8,6 +8,7 @@
     $settings['sqlColor'] = true;
 	$settings['title'] = null;
 	$settings['sampleLimit'] = 1;
+	$settings['oldSlowQueryFormat'] = false;
 
     $settings['defaultColumnVis']['Checksum']      = true;
     $settings['defaultColumnVis']['Count']         = true;
@@ -29,6 +30,19 @@
         $settings['defaultColumnVis']['AvgMS']         = false;
     }
 
+	if ($settings['oldSlowQueryFormat']) {
+		define('Tmp_table_on_disk_cnt', 'Disk_tmp_table_cnt');
+		define('Tmp_table_on_disk_sum', 'Disk_tmp_table_sum');
+		define('Filesort_on_disk_cnt',  'Disk_filesort_cnt');
+		define('Filesort_on_disk_sum',  'Disk_filesort_sum');
+	}
+	else {
+		define('Tmp_table_on_disk_cnt', 'Tmp_table_on_disk_cnt');
+		define('Tmp_table_on_disk_sum', 'Tmp_table_on_disk_sum');
+		define('Filesort_on_disk_cnt',  'Filesort_on_disk_cnt');
+		define('Filesort_on_disk_sum',  'Filesort_on_disk_sum');
+	}
+	
 	require_once('util.php');
 	require_once('libs/Database/Database.php');
 

list-ajax.php

@@ -56,7 +56,7 @@
         $query .= '       ROUND(SUM(history.query_time_sum), 2)*1000                        AS `time`,';
         $query .= '       ROUND(SUM(history.query_time_sum)*1000/SUM(history.ts_cnt), 2)    AS time_avg,';
 
-        $query .= '       IFNULL(SUM(history.Disk_tmp_table_sum), 0)                        AS disk_tmp_table,';
+        $query .= '       IFNULL(SUM(history.'.Tmp_table_on_disk_sum.'), 0)                 AS disk_tmp_table,';
         $query .= '       IFNULL(SUM(history.Tmp_table_sum), 0)                             AS tmp_table';
 
         $query .= '  FROM '.Database::escapeField($reviewhost['review_table']).'            AS review';

review.php

@@ -258,17 +258,17 @@
                         <td class="number"><?php echo $historyData['Tmp_table_sum']; ?></td>
                         <td class="number"><?php if ($historyData['Tmp_table_cnt']) echo round($historyData['Tmp_table_sum']/$historyData['Tmp_table_cnt']*100, 0); ?></td></tr>
                     <tr><td>On Disk Temporary Tables</td>
-                        <td class="number"><?php echo $historyData['Disk_tmp_table_cnt']; ?></td>
-                        <td class="number"><?php echo $historyData['Disk_tmp_table_sum']; ?></td>
-                        <td class="number"><?php if ($historyData['Disk_tmp_table_cnt']) echo round($historyData['Disk_tmp_table_sum']/$historyData['Disk_tmp_table_cnt']*100, 0); ?></td></tr>
+                        <td class="number"><?php echo $historyData[Tmp_table_on_disk_cnt]; ?></td>
+                        <td class="number"><?php echo $historyData[Tmp_table_on_disk_sum]; ?></td>
+                        <td class="number"><?php if ($historyData[Tmp_table_on_disk_cnt]) echo round($historyData[Tmp_table_on_disk_sum]/$historyData[Tmp_table_on_disk_cnt]*100, 0); ?></td></tr>
                     <tr><td>File Sorts</td>
                         <td class="number"><?php echo $historyData['Filesort_cnt']; ?></td>
                         <td class="number"><?php echo $historyData['Filesort_sum']; ?></td>
                         <td class="number"><?php if ($historyData['Filesort_cnt']) echo round($historyData['Filesort_sum']/$historyData['Filesort_cnt']*100, 0); ?></td></tr>
                     <tr><td>On Disk File Sorts</td>
-                        <td class="number"><?php echo $historyData['Disk_filesort_cnt']; ?></td>
-                        <td class="number"><?php echo $historyData['Disk_filesort_sum']; ?></td>
-                        <td class="number"><?php if ($historyData['Disk_filesort_cnt']) echo round($historyData['Disk_filesort_sum']/$historyData['Disk_filesort_cnt']*100, 0); ?></td></tr>
+                        <td class="number"><?php echo $historyData[Filesort_on_disk_cnt]; ?></td>
+                        <td class="number"><?php echo $historyData[Filesort_on_disk_sum]; ?></td>
+                        <td class="number"><?php if ($historyData[Filesort_on_disk_cnt]) echo round($historyData[Filesort_on_disk_sum]/$historyData[Filesort_on_disk_cnt]*100, 0); ?></td></tr>
                 </tbody>
             </table>
             <br>