Merging unmerged code. MDL-11743 and MDL-11671

diff --git a/lib/setuplib.php b/lib/setuplib.php
index f93fa0ddb36b980efa1e3e0e8530f9c3883e2d1f..eef09358900d6407d3ed56237e6927a064bb646e 100644 (file)
--- a/lib/setuplib.php
+++ b/lib/setuplib.php
@@ -174,7 +174,7 @@ function setup_is_unicodedb() {
 
     switch ($dbfamily) {
         case 'mysql':
-            $rs = $db->Execute("SHOW VARIABLES LIKE 'character_set_database'");
+            $rs = $db->Execute("SHOW LOCAL VARIABLES LIKE 'character_set_database'");
             if ($rs && !$rs->EOF) { // rs_EOF() not available yet
                 $records = $rs->GetAssoc(true);
                 $encoding = $records['character_set_database']['Value'];