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

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

diff --cc sonar-application/src/main/java/org/sonar/application/JdbcSettings.java
index b2f36dbb6c01d7f58bb599982f9cfa15bbe00216,20e32cacd02b25ff12ebaec62f3f763ef20161c3..4a34e55a642fc28df3a92487b005d96a03a88462
--- 1/sonar-application/src/main/java/org/sonar/application/JdbcSettings.java
--- 2/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 d6fd2af70e25212c9a13889b6d4d2fa793f9c485,ad603c4e45357e1382281296ae0870870d0ab84b..5a2708ab5c89460bb83df04dac48b0e52ff24c8f
--- 1/sonar-application/src/test/java/org/sonar/application/JdbcSettingsTest.java
--- 2/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 {