Merge pull request #11662 from devenbansod/fix_11661

Fix #11661 : Error changing table column's encoding (collation)
phpmyadmin · Nov 12, 2015 · ab5de22 · ab5de22
2 parents 34f310c + 99be092
commit ab5de22
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/libraries/controllers/TableStructureController.class.php b/libraries/controllers/TableStructureController.class.php
@@ -696,13 +696,21 @@ protected function updateColumns()
                 PMA_previewSQL(count($changes) > 0 ? $sql_query : '');
             }
 
+            $columns_with_index = $this->dbi
+                ->getTable($this->db, $this->table)
+                ->getColumnsWithIndex(
+                    PMA_Index::PRIMARY | PMA_Index::UNIQUE | PMA_Index::INDEX
+                    | PMA_Index::SPATIAL | PMA_Index::FULLTEXT
+                );
+
             $changedToBlob = array();
             // While changing the Column Collation
             // First change to BLOB
             for ($i = 0; $i < $field_cnt; $i++ ) {
                 if (isset($_REQUEST['field_collation'][$i])
                     && isset($_REQUEST['field_collation_orig'][$i])
                     && $_REQUEST['field_collation'][$i] !== $_REQUEST['field_collation_orig'][$i]
+                    && ! in_array($_REQUEST['field_orig'][$i], $columns_with_index)
                 ) {
                     $secondary_query = 'ALTER TABLE ' . PMA_Util::backquote(
                         $this->table