From 54246761ef5bd174a7100e49a1a95dc5bd930f18 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 20 Aug 2015 06:48:21 +0530 Subject: [PATCH] Fix #11410 SPATIAL index option is not clickable. Spatial indexes are supported by InnoDB from MySQL 5.7.5 Signed-off-by: Madhura Jayaratne --- libraries/structure.lib.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index ed2390df32..bc5a13d17a 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -1504,7 +1504,9 @@ function PMA_getHtmlForCheckAllTableColumn($pmaThemeImage, $text_dir, ); } - if (! empty($tbl_storage_engine) && $tbl_storage_engine == 'MYISAM') { + if ((! empty($tbl_storage_engine) && $tbl_storage_engine == 'MYISAM') + || PMA_MYSQL_INT_VERSION >= 50705 + ) { $html_output .= PMA_Util::getButtonOrImage( 'submit_mult', 'mult_submit', 'submit_mult_spatial', __('Spatial'), 'b_spatial.png', 'spatial' @@ -2128,8 +2130,9 @@ function PMA_getHtmlForActionsInTableStructure($type, $tbl_storage_engine, $html_output .= PMA_getHtmlForActionRowInStructureTable( $type, $tbl_storage_engine, 'spatial nowrap', - (! in_array($type, $spatial_types) - || 'MYISAM' != $tbl_storage_engine + ! (in_array($type, $spatial_types) + && ('MYISAM' == $tbl_storage_engine + || PMA_MYSQL_INT_VERSION >= 50705) ), false, $url_query, $primary, 'ADD SPATIAL', __('An index has been added on %s.'), 'Spatial',