aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-06-24 18:29:04 +0100
committerMatthew Wild <mwild1@gmail.com>2013-06-24 18:29:04 +0100
commit4d4d9b30933ebc9b8b12a455f171acf5714d5b2c (patch)
tree76ea4bc5aa6f15cd5c7b6d0ad0abda58e1671a4b
parentd2d4d4d35f830e93719aee3b035349bd90c2955c (diff)
parent12877796b2c8f0a4a9c6d3396da7a45a983a0db1 (diff)
downloadprosody-4d4d9b30933ebc9b8b12a455f171acf5714d5b2c.tar.gz
prosody-4d4d9b30933ebc9b8b12a455f171acf5714d5b2c.zip
Merge 0.9->trunk
-rw-r--r--plugins/mod_storage_sql2.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_storage_sql2.lua b/plugins/mod_storage_sql2.lua
index 7d705b0b..382c0e23 100644
--- a/plugins/mod_storage_sql2.lua
+++ b/plugins/mod_storage_sql2.lua
@@ -85,7 +85,7 @@ local function set_encoding()
module:log("warn", "Found %d columns in prosody table requiring encoding change, updating now...", n_bad_columns);
local fix_column_query1 = "ALTER TABLE `prosody` CHANGE `%s` `%s` BLOB;";
local fix_column_query2 = "ALTER TABLE `prosody` CHANGE `%s` `%s` %s CHARACTER SET 'utf8' COLLATE 'utf8_bin';";
- for row in success:rows() do
+ for row in result:rows() do
local column_name, column_type = unpack(row);
engine:execute(fix_column_query1:format(column_name, column_name));
engine:execute(fix_column_query2:format(column_name, column_name, column_type));