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

ChangeLog

@@ -53,6 +53,7 @@ phpMyAdmin - ChangeLog
 - bug #3367993 [usability] Missing "Generate Password" button
 - bug #3363221 [display] Missing Server Parameter on inline sql query
 - bug #3367986 [navi] Drop field -> lost active table
+- remove misleading comment on the "Rename database" interface
 
 3.4.3.1 (2011-07-02)
 - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5

db_operations.php

@@ -404,17 +404,6 @@ if ($db != 'mysql') {
     ?>
         </legend>
         <input id="new_db_name" type="text" name="newname" size="30" class="textfield" value="" />
-        <?php
-    echo '(' . __('Command') . ': ';
-    /**
-     * @todo (see explanations above in a previous todo)
-     */
-    //if (PMA_MYSQL_INT_VERSION >= XYYZZ) {
-    //    echo 'RENAME DATABASE';
-    //} else {
-        echo 'INSERT INTO ... SELECT';
-    //}
-    echo ')'; ?>
     </fieldset>
     <fieldset class="tblFooters">
         <input id="rename_db_input" type="submit" value="<?php echo __('Go'); ?>" />