webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-29 21:24:44 +03:00
Code Activity

Merge remote-tracking branch 'origin/QA_3_5'

Browse Source 
Conflicts:
	libraries/common.lib.php
This commit is contained in:
Michal Čihař
2012-09-06 16:19:05 +02:00
parent 3ff0568339 62b36292d4
commit e12cd648b0
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/CommonFunctions.class.php
View File

@@ -540,6 +540,8 @@ class PMA_CommonFunctions
$mysql = '5.5';
} else if (PMA_MYSQL_INT_VERSION >= 50100) {
$mysql = '5.1';
} else {
$mysql = '5.0';
}
}
$url = $cfg['MySQLManualBase']