Merge remote-tracking branch 'origin/QA_3_5'

Conflicts: libraries/common.lib.php
2012-09-06 16:19:05 +02:00 · 2012-09-06 16:19:05 +02:00 · e12cd648b0
commit e12cd648b0
parent 3ff0568339 62b36292d4
1 changed files with 2 additions and 0 deletions
--- a/libraries/CommonFunctions.class.php
+++ b/libraries/CommonFunctions.class.php
@ -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']