diff --git a/Cake/Database/Driver/Mysql.php b/Cake/Database/Driver/Mysql.php index 10807089fcf..631cdab0336 100644 --- a/Cake/Database/Driver/Mysql.php +++ b/Cake/Database/Driver/Mysql.php @@ -65,10 +65,13 @@ public function connect() { $config['flags'] += [ PDO::ATTR_PERSISTENT => $config['persistent'], PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true, - PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, - PDO::MYSQL_ATTR_INIT_COMMAND => implode(';', (array)$config['init']) + PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION ]; + if ($config['init']) { + $config['flags'] += [PDO::MYSQL_ATTR_INIT_COMMAND => implode(';', (array)$config['init'])]; + } + if (!empty($config['ssl_key']) && !empty($config['ssl_cert'])) { $config['flags'][PDO::MYSQL_ATTR_SSL_KEY] = $config['ssl_key']; $config['flags'][PDO::MYSQL_ATTR_SSL_CERT] = $config['ssl_cert'];