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

Remember also MySQL major version.

Browse Source
This commit is contained in:
Michal Čihař
2010-10-21 10:04:15 +02:00
parent 61851eb80d
commit 2c7161c7a3
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/database_interface.lib.php
View File

@@ -955,12 +955,14 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
if (! defined('PMA_MYSQL_INT_VERSION')) { if (! defined('PMA_MYSQL_INT_VERSION')) {
if (PMA_cacheExists('PMA_MYSQL_INT_VERSION', true)) { if (PMA_cacheExists('PMA_MYSQL_INT_VERSION', true)) {
define('PMA_MYSQL_INT_VERSION', PMA_cacheGet('PMA_MYSQL_INT_VERSION', true)); define('PMA_MYSQL_INT_VERSION', PMA_cacheGet('PMA_MYSQL_INT_VERSION', true));
define('PMA_MYSQL_MAJOR_VERSION', PMA_cacheGet('PMA_MYSQL_MAJOR_VERSION', true));
define('PMA_MYSQL_STR_VERSION', PMA_cacheGet('PMA_MYSQL_STR_VERSION', true)); define('PMA_MYSQL_STR_VERSION', PMA_cacheGet('PMA_MYSQL_STR_VERSION', true));
} else { } else {
$mysql_version = PMA_DBI_fetch_value( $mysql_version = PMA_DBI_fetch_value(
'SELECT VERSION()', 0, 0, $link, PMA_DBI_QUERY_STORE); 'SELECT VERSION()', 0, 0, $link, PMA_DBI_QUERY_STORE);
if ($mysql_version) { if ($mysql_version) {
$match = explode('.', $mysql_version); $match = explode('.', $mysql_version);
define('PMA_MYSQL_MAJOR_VERSION', (int)$match[0]);
define('PMA_MYSQL_INT_VERSION', define('PMA_MYSQL_INT_VERSION',
(int) sprintf('%d%02d%02d', $match[0], $match[1], (int) sprintf('%d%02d%02d', $match[0], $match[1],
intval($match[2]))); intval($match[2])));
@@ -968,9 +970,11 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
unset($mysql_version, $match); unset($mysql_version, $match);
} else { } else {
define('PMA_MYSQL_INT_VERSION', 50015); define('PMA_MYSQL_INT_VERSION', 50015);
define('PMA_MYSQL_MAJOR_VERSION', 5);
define('PMA_MYSQL_STR_VERSION', '5.00.15'); define('PMA_MYSQL_STR_VERSION', '5.00.15');
} }
PMA_cacheSet('PMA_MYSQL_INT_VERSION', PMA_MYSQL_INT_VERSION, true); PMA_cacheSet('PMA_MYSQL_INT_VERSION', PMA_MYSQL_INT_VERSION, true);
PMA_cacheSet('PMA_MYSQL_MAJOR_VERSION', PMA_MYSQL_MAJOR_VERSION, true);
PMA_cacheSet('PMA_MYSQL_STR_VERSION', PMA_MYSQL_STR_VERSION, true); PMA_cacheSet('PMA_MYSQL_STR_VERSION', PMA_MYSQL_STR_VERSION, true);
} }
} }