The branch, QA_3_4 has been updated via c02bd600eeee9a9f17a51c602bc32917de5e28eb (commit) via 0bdbde8c90aa4fba8fa492dcddfac443dc74aaf4 (commit) from 2694b3dae0e8c8feeb0c67f0c7606c351443fe42 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/db_info.inc.php | 9 +++++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 167760d..614d066 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 3.4.6.0 (not yet released) +- patch #3404173 InnoDB comment display with tooltips/aliases 3.4.5.0 (not yet released) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index d8610f2..44dc3a8 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -66,6 +66,15 @@ $pos = $_SESSION['tmp_user_values']['table_limit_offset']; */ function PMA_fillTooltip(&$tooltip_truename, &$tooltip_aliasname, $table) { + if (strstr($table['Comment'], '; InnoDB free') === false) { + if (!strstr($table['Comment'], 'InnoDB free') === false) { + // here we have just InnoDB generated part + $table['Comment'] = ''; + } + } else { + // remove InnoDB comment from end, just the minimal part (*? is non greedy) + $table['Comment'] = preg_replace('@; InnoDB free:.*?$@', '', $table['Comment']); + } if (empty($table['Comment'])) { $table['Comment'] = $table['Name']; } else { hooks/post-receive -- phpMyAdmin