# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1307075722 -3600
# Node ID e2674029b8c9a473c8a6998f7d3d5303633bbadd
# Parent  da4844ab289f6ae3512dd02f0c21cbc8123788bf# Parent  c1dff8c0c3e77a9f474721b81af08c2b4c4497f1
Merge 0.8->trunk

diff -r da4844ab289f -r e2674029b8c9 .hgtags
--- a/.hgtags	Fri Jun 03 00:58:09 2011 +0100
+++ b/.hgtags	Fri Jun 03 05:35:22 2011 +0100
@@ -42,3 +42,5 @@
 5ea90ee96022b9c106e7e79b4a1d8b2ee99d45dc 0.7.0
 49b9e73e31ef38ff1c0141a83f897b5837c40d83 0.8.0
 aa905291a66c7d8168b1cb912bb173e6478dac05 0.8.1
+aa905291a66c7d8168b1cb912bb173e6478dac05 0.8.1
+3421dfaa81880201e9ade8b4eee727ade9a9ce33 0.8.1
diff -r da4844ab289f -r e2674029b8c9 plugins/mod_storage_sql.lua
--- a/plugins/mod_storage_sql.lua	Fri Jun 03 00:58:09 2011 +0100
+++ b/plugins/mod_storage_sql.lua	Fri Jun 03 05:35:22 2011 +0100
@@ -108,6 +108,8 @@
 					end
 				end
 				repeat until not stmt:fetch();
+			else
+				module:log("error", "Failed to upgrade database schema, please see http://prosody.im/doc/mysql for help");
 			end
 		end
 	end