The branch, master has been updated
via f1fbb2bb8c2ef908170fb919a9d9fbeb179b6205 (commit)
via c02bd600eeee9a9f17a51c602bc32917de5e28eb (commit)
via 0bdbde8c90aa4fba8fa492dcddfac443dc74aaf4 (commit)
from f4a5bf4f586484719d48557c29b8bed729495702 (commit)
- Log -----------------------------------------------------------------
commit f1fbb2bb8c2ef908170fb919a9d9fbeb179b6205
Merge: f4a5bf4 c02bd60
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Sep 7 07:37:23 2011 -0400
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
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 6020d7b..c22bfe9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,7 @@ phpMyAdmin - ChangeLog
+ Support Drizzle database
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 9a92bad..80b8c51 100644
--- a/libraries/db_info.inc.php
+++ b/libraries/db_info.inc.php
@@ -41,6 +41,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