diff --git a/ChangeLog b/ChangeLog index d8280e439..66abea401 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2003-04-11 Marc Delisle + * libraries/common.lib.php3, config_import.lib.php3: + MaxExactCount backwards compatibility + 2003-04-11 Michal Cihar * db_details_structure.php3: Get row count by SHOW TABLE STATUS, and by SELECT COUNT(*) only for small (<20000 rows) tables (RFE #708533). diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3 index 0c092f985..ca05c6b8b 100644 --- a/libraries/common.lib.php3 +++ b/libraries/common.lib.php3 @@ -138,7 +138,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold} * Includes compatibility code for older config.inc.php3 revisions * if necessary */ - if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 168) { + if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 174) { include('./libraries/config_import.lib.php3'); } diff --git a/libraries/config_import.lib.php3 b/libraries/config_import.lib.php3 index eee209d14..df12aed54 100644 --- a/libraries/config_import.lib.php3 +++ b/libraries/config_import.lib.php3 @@ -44,7 +44,6 @@ * Finally, set x to the _new_ revision number of config.inc.php3 * (without '1.': 234 instead of 1.234) and you're done! */ - if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) { define('PMA_CONFIG_IMPORT_LIB_INCLUDED', 1); @@ -718,6 +717,10 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) { $cfg['BrowseMIME'] = TRUE; } + if (!isset($cfg['MaxExactCount'])) { + $cfg['MaxExactCount'] = 20000; + } + if (!isset($cfg['ShowTooltipAliasDB'])) { $cfg['ShowTooltipAliasDB'] = FALSE; } @@ -1044,6 +1047,7 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) { if (!isset($cfg['PmaNoRelation_DisableWarning'])) { $cfg['PmaNoRelation_DisableWarning'] = FALSE; } + } // $__PMA_CONFIG_IMPORT_LIB__ ?>