From: stronk7 <stronk7>
Date: Sun, 18 Nov 2007 17:12:58 +0000 (+0000)
Subject: Merging unmerged code. MDL-11743 and MDL-11671
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=d4775d5495c1d1f6ecc55555e2f55471031620d6;p=moodle.git

Merging unmerged code. MDL-11743 and MDL-11671
---

diff --git a/lib/setuplib.php b/lib/setuplib.php
index f93fa0ddb3..eef0935890 100644
--- 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'];