diff --git a/libraries/tbl_common.php b/libraries/tbl_common.php index 75dab272a..70279eca5 100644 --- a/libraries/tbl_common.php +++ b/libraries/tbl_common.php @@ -14,7 +14,7 @@ require_once './libraries/bookmark.lib.php'; // Check parameters PMA_checkParameters(array('db', 'table')); -if (PMA_MYSQL_INT_VERSION >= 50002 && $db === 'information_schema') { +if ($db === 'information_schema') { $db_is_information_schema = true; } else { $db_is_information_schema = false; diff --git a/libraries/tbl_indexes.lib.php b/libraries/tbl_indexes.lib.php index ee59d8370..74f9eec05 100644 --- a/libraries/tbl_indexes.lib.php +++ b/libraries/tbl_indexes.lib.php @@ -204,8 +204,7 @@ function PMA_show_indexes($table, &$indexes, &$indexes_info, &$indexes_data, . ' ' . "\n"; } - if ((PMA_MYSQL_INT_VERSION < 40002 && $indexes_info[$index_name]['Comment'] == 'FULLTEXT') - || (PMA_MYSQL_INT_VERSION >= 40002 && $indexes_info[$index_name]['Index_type'] == 'FULLTEXT')) { + if ($indexes_info[$index_name]['Index_type'] == 'FULLTEXT') { $index_type = 'FULLTEXT'; } elseif ($index_name == 'PRIMARY') { $index_type = 'PRIMARY'; diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php index 330007834..c7a532262 100644 --- a/libraries/tbl_links.inc.php +++ b/libraries/tbl_links.inc.php @@ -86,13 +86,10 @@ if (! $tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information_ $tabs['operation']['link'] = 'tbl_operations.php'; $tabs['operation']['text'] = $strOperations; - $ln8_stt = (PMA_MYSQL_INT_VERSION >= 40000) - ? 'TRUNCATE TABLE ' - : 'DELETE FROM '; $tabs['empty']['link'] = 'sql.php'; - $tabs['empty']['args']['sql_query'] = $ln8_stt . PMA_backquote($table); + $tabs['empty']['args']['sql_query'] = 'TRUNCATE TABLE ' . PMA_backquote($table); $tabs['empty']['args']['zero_rows'] = sprintf($strTableHasBeenEmptied, htmlspecialchars($table)); - $tabs['empty']['attr'] = 'onclick="return confirmLink(this, \'' . $ln8_stt . PMA_jsFormat($table) . '\')"'; + $tabs['empty']['attr'] = 'onclick="return confirmLink(this, \'TRUNCATE TABLE ' . PMA_jsFormat($table) . '\')"'; $tabs['empty']['args']['goto'] = 'tbl_structure.php'; $tabs['empty']['class'] = 'caution'; $tabs['empty']['icon'] = 'b_empty.png'; diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 14e4d0562..5857ff7ae 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -41,8 +41,7 @@ document.onkeydown = onKeyDownArrowsHandler; // the default CURRENT TIMESTAMP checkbox and label // and, field_x_7a represents the checkbox itself -if (PMA_MYSQL_INT_VERSION >= 40102) { - ?> +?> -