# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1458735563 0
# Node ID 316ca5c1525500b46bbbec80a9b134ee6cacedc5
# Parent  66873c5e206178ecd8ae8e2cbdbbddf057549345# Parent  b4e99602ae753276096a14a9c9a568a51e4abf71
Merge 0.10->trunk

diff -r 66873c5e2061 -r 316ca5c15255 prosodyctl
--- a/prosodyctl	Mon Mar 21 21:05:15 2016 +0000
+++ b/prosodyctl	Wed Mar 23 12:19:23 2016 +0000
@@ -1063,11 +1063,15 @@
 		
 		local v6_supported = not not socket.tcp6;
 		
-		for host, host_options in enabled_hosts() do
+		for jid, host_options in enabled_hosts() do
 			local all_targets_ok, some_targets_ok = true, false;
+			local node, host = jid_split(jid);
 			
 			local is_component = not not host_options.component_module;
-			print("Checking DNS for "..(is_component and "component" or "host").." "..host.."...");
+			print("Checking DNS for "..(is_component and "component" or "host").." "..jid.."...");
+			if node then
+				print("Only the domain part ("..host..") is used in DNS.")
+			end
 			local target_hosts = set.new();
 			if not is_component then
 				local res = dns.lookup("_xmpp-client._tcp."..idna.to_ascii(host)..".", "SRV");
diff -r 66873c5e2061 -r 316ca5c15255 util/sql.lua
--- a/util/sql.lua	Mon Mar 21 21:05:15 2016 +0000
+++ b/util/sql.lua	Wed Mar 23 12:19:23 2016 +0000
@@ -328,7 +328,7 @@
 		local ok, actual_charset = self:transaction(function ()
 			return self:select"SHOW SESSION VARIABLES LIKE 'character_set_client'";
 		end);
-		local charset_ok;
+		local charset_ok = true;
 		for row in actual_charset do
 			if row[2] ~= charset then
 				log("error", "MySQL %s is actually %q (expected %q)", row[1], row[2], charset);