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

bug #1033388 and optimizations

Browse Source
This commit is contained in:
Alexander M. Turek
2004-10-12 21:08:49 +00:00
parent 9ab1eb5a2d
commit 751404c428
4 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/database_interface.lib.php
View File

@@ -115,7 +115,7 @@ function PMA_DBI_get_variable($var, $type = PMA_DBI_GETVAR_SESSION, $link = NULL
}
function PMA_DBI_postConnect($link) {
global $collation_connection;
global $collation_connection, $charset_connection;
if (!defined('PMA_MYSQL_INT_VERSION')) {
$result = PMA_DBI_query('SELECT VERSION() AS version', $link, PMA_DBI_QUERY_STORE);
if ($result != FALSE && @PMA_DBI_num_rows($result) > 0) {
@@ -167,7 +167,8 @@ function PMA_DBI_postConnect($link) {
if (!empty($collation_connection)) {
PMA_DBI_query('SET collation_connection = \'' . $collation_connection . '\';', $link, PMA_DBI_QUERY_STORE);
}
$collation_connection = PMA_DBI_get_variable('collation_connection', PMA_DBI_GETVAR_SESSION, $link);
$collation_connection = PMA_DBI_get_variable('collation_connection', PMA_DBI_GETVAR_SESSION, $link);
$charset_connection = PMA_DBI_get_variable('character_set_connection', PMA_DBI_GETVAR_SESSION, $link);
// Add some field types to the list
// (we pass twice here; feel free to code something better :)