From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Fri, 17 Oct 2014 07:13:15 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/branch-4.5'
X-Git-Tag: 5.0-RC1~672
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0f6775907280ff2d0b5e3ea9d4c2cff9755c63d1;p=sonarqube.git

Merge remote-tracking branch 'origin/branch-4.5'

Conflicts:
	sonar-application/src/test/java/org/sonar/application/JdbcSettingsTest.java
---

0f6775907280ff2d0b5e3ea9d4c2cff9755c63d1
diff --cc sonar-application/src/main/java/org/sonar/application/JdbcSettings.java
index b2f36dbb6c0,20e32cacd02..4a34e55a642
--- a/sonar-application/src/main/java/org/sonar/application/JdbcSettings.java
+++ b/sonar-application/src/main/java/org/sonar/application/JdbcSettings.java
@@@ -92,10 -95,9 +92,9 @@@ public class JdbcSettings 
    }
  
    void checkUrlParameters(Provider provider, String url) {
 -    if (Provider.mysql.equals(provider)) {
 +    if (Provider.MYSQL.equals(provider)) {
        checkRequiredParameter(url, "useUnicode=true");
        checkRequiredParameter(url, "characterEncoding=utf8");
-       checkRequiredParameter(url, "useCursorFetch=true");
        checkRecommendedParameter(url, "rewriteBatchedStatements=true");
        checkRecommendedParameter(url, "useConfigs=maxPerformance");
      }
diff --cc sonar-application/src/test/java/org/sonar/application/JdbcSettingsTest.java
index d6fd2af70e2,ad603c4e453..5a2708ab5c8
--- a/sonar-application/src/test/java/org/sonar/application/JdbcSettingsTest.java
+++ b/sonar-application/src/test/java/org/sonar/application/JdbcSettingsTest.java
@@@ -64,12 -63,12 +64,12 @@@ public class JdbcSettingsTest 
      Props props = new Props(new Properties());
  
      // minimal -> ok
 -    settings.checkUrlParameters(JdbcSettings.Provider.mysql,
 +    settings.checkUrlParameters(JdbcSettings.Provider.MYSQL,
-       "jdbc:mysql://localhost:3306/sonar?useUnicode=true&characterEncoding=utf8&useCursorFetch=true");
+       "jdbc:mysql://localhost:3306/sonar?useUnicode=true&characterEncoding=utf8");
  
      // full -> ok
 -    settings.checkUrlParameters(JdbcSettings.Provider.mysql,
 +    settings.checkUrlParameters(JdbcSettings.Provider.MYSQL,
-       "jdbc:mysql://localhost:3306/sonar?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&useConfigs=maxPerformance&useCursorFetch=true");
+       "jdbc:mysql://localhost:3306/sonar?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&useConfigs=maxPerformance");
  
      // missing required -> ko
      try {