diff --git a/Documentation.html b/Documentation.html index 05f1e93f9c..bdcc80fbb2 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1238,19 +1238,6 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE data (referring to tables which no longer exist).
We only keep this number of newest rows in table_uiprefs and automatically delete older rows. -
$cfg['Servers'][$i]['verbose_check'] boolean -
-
Because release 2.5.0 introduced the new MIME-transformation support, the - column_info table got enhanced with three new columns. If the above variable - is set to TRUE (default) phpMyAdmin will check if you have the - latest table structure available. If not, it will emit a warning to the - superuser.

- - You can disable this checking behavior by setting the variable to false, - which should offer a performance increase.

- - Recommended to set to FALSE, when you are sure, your table structure is - up to date.
$cfg['Servers'][$i]['AllowRoot'] boolean
Whether to allow root access. This is just a shortcut for the AllowDeny rules below. diff --git a/libraries/config.default.php b/libraries/config.default.php index fcf7d406cb..217d1cb9d8 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -399,14 +399,6 @@ $cfg['Servers'][$i]['userconfig'] = ''; */ $cfg['Servers'][$i]['MaxTableUiprefs'] = 100; -/** - * set to false if you know that your pma_* tables are up to date. - * This prevents compatibility checks and thereby increases performance. - * - * @global boolean $cfg['Servers'][$i]['verbose_check'] - */ -$cfg['Servers'][$i]['verbose_check'] = true; - /** * whether to allow root login * diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index ed36b8775e..bd7d10a5d3 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -449,8 +449,6 @@ $strConfigServers_userconfig_desc = __('Leave blank for no user preferences stor $strConfigServers_userconfig_name = __('User preferences storage table'); $strConfigServers_user_desc = __('Leave empty if not using config auth'); $strConfigServers_user_name = __('User for config auth'); -$strConfigServers_verbose_check_desc = __('Disable if you know that your pma_* tables are up to date. This prevents compatibility checks and thereby increases performance'); -$strConfigServers_verbose_check_name = __('Verbose check'); $strConfigServers_verbose_desc = __('A user-friendly description of this server. Leave blank to display the hostname instead.'); $strConfigServers_verbose_name = __('Verbose name of this server'); $strConfigShowAll_desc = __('Whether a user should be displayed a "show all (rows)" button'); diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php index 94912567fd..5ca2f03e08 100644 --- a/libraries/config/setup.forms.php +++ b/libraries/config/setup.forms.php @@ -67,7 +67,6 @@ $forms['Servers']['Server_pmadb'] = array('Servers' => array(1 => array( 'controlhost', 'controluser', 'controlpass', - 'verbose_check', 'bookmarktable' => 'pma_bookmark', 'relation' => 'pma_relation', 'userconfig' => 'pma_userconfig', diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 61164478ac..95372ec70e 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -293,34 +293,7 @@ function PMA__getRelationsParam() if (isset($cfgRelation['column_info'])) { $cfgRelation['commwork'] = true; - - if ($GLOBALS['cfg']['Server']['verbose_check']) { - $mime_query = PMA_DBI_get_columns_sql($cfgRelation['db'], $cfgRelation['column_info']); - $mime_rs = PMA_query_as_controluser($mime_query, false); - - $mime_field_mimetype = false; - $mime_field_transformation = false; - $mime_field_transformation_options = false; - while ($curr_mime_field = @PMA_DBI_fetch_row($mime_rs)) { - if ($curr_mime_field[0] == 'mimetype') { - $mime_field_mimetype = true; - } elseif ($curr_mime_field[0] == 'transformation') { - $mime_field_transformation = true; - } elseif ($curr_mime_field[0] == 'transformation_options') { - $mime_field_transformation_options = true; - } - } - PMA_DBI_free_result($mime_rs); - - if ($mime_field_mimetype - && $mime_field_transformation - && $mime_field_transformation_options - ) { - $cfgRelation['mimework'] = true; - } - } else { - $cfgRelation['mimework'] = true; - } + $cfgRelation['mimework'] = true; } if (isset($cfgRelation['history'])) {