[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2099-g43d80c6

[Marc Delisle]

The branch, master has been updated
       via  43d80c678b114478276f0a32d2a60627e1ff796c (commit)
       via  05a7a9f30724974df30925945cda99c1d25152fc (commit)
       via  ef2a411db9b005956705c4c3b577f2848189ec26 (commit)
      from  a7a986b84c473cd7ef199e652404cd19207dbc57 (commit)


- Log -----------------------------------------------------------------
commit 43d80c678b114478276f0a32d2a60627e1ff796c
Merge: 05a7a9f30724974df30925945cda99c1d25152fc a7a986b84c473cd7ef199e652404cd19207dbc57
Author: Marc Delisle <marc at infomarc.info>
Date:   Thu Apr 29 12:34:32 2010 -0400

    Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

commit 05a7a9f30724974df30925945cda99c1d25152fc
Merge: 407054b6b147b2d877dc73a9f316045f3615172b ef2a411db9b005956705c4c3b577f2848189ec26
Author: Marc Delisle <marc at infomarc.info>
Date:   Thu Apr 29 12:31:10 2010 -0400

    Merge branch 'QA_3_3'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |    1 +
 tbl_structure.php |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cc81a36..278d923 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -103,6 +103,7 @@ $Id$
 - bug [tracking] Tracking report should obey MaxCharactersInDisplayedSQL 
 - bug [edit] Avoid selecting UNHEX function by default for a BLOB column for
   which editing is protected
+- bug #2994168 [structure] Show auto_increment in uppercase 
 
 3.3.2.0 (2010-04-13)
 - patch #2969449 [core] Name for MERGE engine varies depending on the
diff --git a/tbl_structure.php b/tbl_structure.php
index c44fa1a..af42e81 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -361,7 +361,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
     else {
         echo '<i>' . $strNoneDefault . '</i>';
     } ?></td>
-    <td nowrap="nowrap"><?php echo $row['Extra']; ?></td>
+    <td nowrap="nowrap"><?php echo strtoupper($row['Extra']); ?></td>
     <td align="center">
         <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('SELECT COUNT(*) AS ' . PMA_backquote($strRows) . ', ' . PMA_backquote($row['Field']) . ' FROM ' . PMA_backquote($table) . ' GROUP BY ' . PMA_backquote($row['Field']) . ' ORDER BY ' . PMA_backquote($row['Field'])); ?>">
             <?php echo $titles['BrowseDistinctValues']; ?></a>


hooks/post-receive
-- 
phpMyAdmin