diff --git a/ChangeLog b/ChangeLog index f2710877d..cbf83bb8b 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2003-04-22 Marc Delisle + * tbl_indexes.php3: bug 725711: FULLTEXT index type not shown + in the drop-down box + 2003-04-20 Garvin Hicking * libraries/display_tbl.lib.php3, index.php3, left.php3, tbl_query_box.php3, queryframe.php3, querywindow.php3: diff --git a/tbl_indexes.php3 b/tbl_indexes.php3 index b1ea5f5d1..cb126e22f 100644 --- a/tbl_indexes.php3 +++ b/tbl_indexes.php3 @@ -248,7 +248,10 @@ else if (!defined('PMA_IDX_INCLUDED') } else { $edited_index_info = $indexes_info[$old_index]; $edited_index_data = $indexes_data[$old_index]; - if ($edited_index_info['Comment'] == 'FULLTEXT') { + + + if ((PMA_MYSQL_INT_VERSION >= 32323 && PMA_MYSQL_INT_VERSION < 40002 && $edited_index_info['Comment'] == 'FULLTEXT') + || (PMA_MYSQL_INT_VERSION >= 40002 && $edited_index_info['Index_type'] == 'FULLTEXT')) { $index_type = 'FULLTEXT'; } else if ($index == 'PRIMARY') { $index_type = 'PRIMARY';