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

Merge remote branch 'origin/master' into export_branch

Browse Source
This commit is contained in:
Adnan
2010-06-24 20:32:35 +05:00
parent 0e9f6247e4 1be2d538df
commit 8dc2149272
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -86,6 +86,8 @@ $Id$
- [core] Update library PHPExcel to version 1.7.3c - [core] Update library PHPExcel to version 1.7.3c
3.3.5.0 (not yet released) 3.3.5.0 (not yet released)
- patch #2932113 [information_schema] Slow export when having lots of
databases, thanks to Stéphane Pontier - shadow_walker
3.3.4.0 (not yet released) 3.3.4.0 (not yet released)
- bug #2996161 [import] properly escape import value - bug #2996161 [import] properly escape import value

12
libraries/mysql_charsets.lib.php
View File

@@ -164,7 +164,17 @@ function PMA_getDbCollation($db) {
return 'utf8_general_ci'; return 'utf8_general_ci';
} }
return PMA_DBI_fetch_value('SELECT DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME = \'' . PMA_sqlAddSlashes($db) . '\' LIMIT 1;'); if (! $GLOBALS['cfg']['Server']['DisableIS']) {
// this is slow with thousands of databases
return PMA_DBI_fetch_value('SELECT DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME = \'' . PMA_sqlAddSlashes($db) . '\' LIMIT 1;');
} else {
PMA_DBI_select_db($db);
$return = PMA_DBI_fetch_value('SHOW VARIABLES LIKE \'collation_database\'', 0, 1);
if ($db !== $GLOBALS['db']) {
PMA_DBI_select_db($GLOBALS['db']);
}
return $return;
}
} }
/** /**