From 8348ed3818f2a86941638f8eab719b674fb879e2 Mon Sep 17 00:00:00 2001
From: Sebastian Mendel <cybot_tm@users.sourceforge.net>
Date: Mon, 15 Oct 2007 08:54:12 +0000
Subject: [PATCH] do not force charset (collation), charset (collation) is
 defined in the db, table and/or field

---
 server_privileges.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/server_privileges.php b/server_privileges.php
index ac79395c1..232ac3330 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -836,13 +836,10 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
             unset($row);
             break;
     }
-    $res = PMA_DBI_query(
-        'SELECT \'foo\' FROM `mysql`.`user`'
-        .' WHERE ' . PMA_convert_using('User')
-        .' = ' . PMA_convert_using(PMA_sqlAddslashes($username), 'quoted')
-        .' AND ' . PMA_convert_using('Host')
-        .' = ' . PMA_convert_using($hostname, 'quoted') . ';',
-        null, PMA_DBI_QUERY_STORE);
+    $sql = "SELECT 'foo' FROM `mysql`.`user`"
+        . " WHERE `User` = '" . PMA_sqlAddslashes($username) . "'"
+        . " AND `Host` = '" . PMA_sqlAddslashes($hostname) . "';";
+    $res = PMA_DBI_query($sql, null, PMA_DBI_QUERY_STORE);
     if (PMA_DBI_num_rows($res) == 1) {
         PMA_DBI_free_result($res);
         $message = new PMA_Message('strUserAlreadyExists', PMA_Message::ERROR);