Comparison

util/sql.lua @ 7313:316ca5c15255

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 23 Mar 2016 12:19:23 +0000
parent 7312:b4e99602ae75
child 7317:a2dce746599b
comparison
equal deleted inserted replaced
7310:66873c5e2061 7313:316ca5c15255
326 326
327 if driver == "MySQL" then 327 if driver == "MySQL" then
328 local ok, actual_charset = self:transaction(function () 328 local ok, actual_charset = self:transaction(function ()
329 return self:select"SHOW SESSION VARIABLES LIKE 'character_set_client'"; 329 return self:select"SHOW SESSION VARIABLES LIKE 'character_set_client'";
330 end); 330 end);
331 local charset_ok; 331 local charset_ok = true;
332 for row in actual_charset do 332 for row in actual_charset do
333 if row[2] ~= charset then 333 if row[2] ~= charset then
334 log("error", "MySQL %s is actually %q (expected %q)", row[1], row[2], charset); 334 log("error", "MySQL %s is actually %q (expected %q)", row[1], row[2], charset);
335 charset_ok = false; 335 charset_ok = false;
336 end 336 end