Commit b19ab36f authored by omega8cc's avatar omega8cc

Merge branch '6.x-2.x' of git.drupal.org:project/provision into dev-nginx-6.x-2.x

parents 32e16342 c92479aa
......@@ -98,7 +98,7 @@ class Provision_Service_db_mysql extends Provision_Service_db_pdo {
}
function grant_host(Provision_Context_server $server) {
$command = sprintf('mysql -u intntnllyInvalid -h %s -P %s -e ""',
$command = sprintf('mysql -u intntnllyInvalid -h %s -P %s -e "SELECT VERSION()"',
escapeshellarg($this->server->remote_host),
escapeshellarg($this->server->db_port));
......@@ -111,7 +111,7 @@ class Provision_Service_db_mysql extends Provision_Service_db_pdo {
return $match[1];
}
else {
return drush_set_error('PROVISION_DB_CONNECT_FAIL', dt('Dummy connection failed to fail: %msg', array('%msg' => join("\n", drush_shell_exec_output()))));
return drush_set_error('PROVISION_DB_CONNECT_FAIL', dt('Dummy connection failed to fail. Either your MySQL permissions are too lax, or the response was not understood. See http://is.gd/Y6i4FO for more information. %msg', array('%msg' => join("\n", drush_shell_exec_output()))));
}
}
......
......@@ -92,6 +92,7 @@ class Provision_Service_http_pack extends Provision_Service_http {
function grant_server_list() {
return array_merge(
array_map('d', $this->server->master_web_servers),
array_map('d', $this->server->slave_web_servers),
array($this->context->platform->server)
);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment