nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MaxExactCount backwards compatibility

Browse Source
This commit is contained in:
Marc Delisle
2003-04-11 17:44:20 +00:00
parent 7b684241bd
commit bbc10b2dba
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-04-11 Marc Delisle <lem9@users.sourceforge.net>
* libraries/common.lib.php3, config_import.lib.php3:
MaxExactCount backwards compatibility
2003-04-11 Michal Cihar <nijel@users.sourceforge.net> 2003-04-11 Michal Cihar <nijel@users.sourceforge.net>
* db_details_structure.php3: Get row count by SHOW TABLE STATUS, and by * db_details_structure.php3: Get row count by SHOW TABLE STATUS, and by
SELECT COUNT(*) only for small (<20000 rows) tables (RFE #708533). SELECT COUNT(*) only for small (<20000 rows) tables (RFE #708533).

2
libraries/common.lib.php3
View File

@@ -138,7 +138,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
* Includes compatibility code for older config.inc.php3 revisions * Includes compatibility code for older config.inc.php3 revisions
* if necessary * 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'); include('./libraries/config_import.lib.php3');
} }

6
libraries/config_import.lib.php3
View File

@@ -44,7 +44,6 @@
* Finally, set x to the _new_ revision number of config.inc.php3 * Finally, set x to the _new_ revision number of config.inc.php3
* (without '1.': 234 instead of 1.234) and you're done! * (without '1.': 234 instead of 1.234) and you're done!
*/ */
if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) { if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
define('PMA_CONFIG_IMPORT_LIB_INCLUDED', 1); define('PMA_CONFIG_IMPORT_LIB_INCLUDED', 1);
@@ -718,6 +717,10 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
$cfg['BrowseMIME'] = TRUE; $cfg['BrowseMIME'] = TRUE;
} }
if (!isset($cfg['MaxExactCount'])) {
$cfg['MaxExactCount'] = 20000;
}
if (!isset($cfg['ShowTooltipAliasDB'])) { if (!isset($cfg['ShowTooltipAliasDB'])) {
$cfg['ShowTooltipAliasDB'] = FALSE; $cfg['ShowTooltipAliasDB'] = FALSE;
} }
@@ -1044,6 +1047,7 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
if (!isset($cfg['PmaNoRelation_DisableWarning'])) { if (!isset($cfg['PmaNoRelation_DisableWarning'])) {
$cfg['PmaNoRelation_DisableWarning'] = FALSE; $cfg['PmaNoRelation_DisableWarning'] = FALSE;
} }
} // $__PMA_CONFIG_IMPORT_LIB__ } // $__PMA_CONFIG_IMPORT_LIB__
?> ?>