Merge branch 'QA_4_9' into QA_5_0

Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2019-12-21 23:37:51 +01:00
commit efbf84bdb1
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
2 changed files with 5 additions and 0 deletions

View File

@ -159,6 +159,7 @@ jobs:
- stage: "Documentation"
name: "Build API docs"
before_install: phpenv config-rm xdebug.ini
before_script: skip
after_script: skip
after_success: skip
@ -182,6 +183,7 @@ jobs:
- TESTSUITE_SELENIUM_BROWSER=chrome
- TESTSUITE_USER=root
- TESTSUITE_URL=http://127.0.0.1:8000
before_install: phpenv config-rm xdebug.ini
install:
- ./test/install-browserstack
- composer install --no-interaction

View File

@ -155,6 +155,9 @@ class Charsets
}
self::loadCharsets($dbi, $disableIs);
$serverCharset = $dbi->getVariable('character_set_server');
if (! is_string($serverCharset)) {// MySQL 5.7.8 fallback, issue #15614
$serverCharset = $dbi->fetchValue("SELECT @@character_set_server;");
}
self::$serverCharset = self::$charsets[$serverCharset];
return self::$serverCharset;
}