diff options
author | Kim Alvefur <zash@zash.se> | 2017-04-12 20:59:18 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-04-12 20:59:18 +0200 |
commit | a22c6725be05e65b0ccde5b8e2b8eb22944a3426 (patch) | |
tree | 812565071e2a3b84ab2fee8ca331e5be4b6e63e7 /plugins | |
parent | 8a9dd05b08a3a85b84680547e9b0f2027499fd37 (diff) | |
parent | b3cd19063f63fa426f35523bfb77be45d1e0dd4e (diff) | |
download | prosody-a22c6725be05e65b0ccde5b8e2b8eb22944a3426.tar.gz prosody-a22c6725be05e65b0ccde5b8e2b8eb22944a3426.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/mod_storage_sql.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua index 70fea09f..bf7190b8 100644 --- a/plugins/mod_storage_sql.lua +++ b/plugins/mod_storage_sql.lua @@ -489,7 +489,7 @@ local function upgrade_table(engine, params, apply_changes) -- luacheck: ignore check_encoding_query = check_encoding_query:format(engine.charset, engine.charset); -- FIXME Is it ok to ignore the return values from this? engine:transaction(function() - local result = engine:execute(check_encoding_query); + local result = assert(engine:execute(check_encoding_query)); local n_bad_columns = result:rowcount(); if n_bad_columns > 0 then changes = true; |