diff --git a/ChangeLog b/ChangeLog index 2e08c759b..3d4fa770b 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2002-11-16 Alexander M. Turek + * tbl_indexes.php3: Fixed bug #638321 (FULLTEXT is not detected correctly + with MySQL >= 4.0.2-alpha). + 2002-11-15 Alexander M. Turek * scripts/create_tables.sql: Added a 'USE' command after 'CREATE DATABASE'. diff --git a/tbl_indexes.php3 b/tbl_indexes.php3 index aa63c706e..b8efd3038 100644 --- a/tbl_indexes.php3 +++ b/tbl_indexes.php3 @@ -103,6 +103,9 @@ for ($i = 0; $i < $idx_cnt; $i++) { $indexes_info[$row['Key_name']]['Comment'] = (isset($row['Comment'])) ? $row['Comment'] : ''; + $indexes_info[$row['Key_name']]['Index_type'] = (isset($row['Index_type'])) + ? $row['Index_type'] + : ''; $indexes_data[$row['Key_name']][$row['Seq_in_index']]['Column_name'] = $row['Column_name']; if (isset($row['Sub_part'])) { @@ -451,7 +454,8 @@ else if (!defined('PMA_IDX_INCLUDED') . ' ' . htmlspecialchars($index_name) . "\n" . ' ' . "\n"; - if ($indexes_info[$index_name]['Comment'] == 'FULLTEXT') { + if ((PMA_MYSQL_INT_VERSION >= 32323 && PMA_MYSQL_INT_VERSION < 40002 && $indexes_info[$index_name]['Comment'] == 'FULLTEXT') + || (PMA_MYSQL_INT_VERSION >= 40002 && $indexes_info[$index_name]['Index_type'] == 'FULLTEXT')) { $index_type = 'FULLTEXT'; } else if ($index_name == 'PRIMARY') { $index_type = 'PRIMARY';