From c1e9fbc54b8fe62b0de18c17961b21737a4789ea Mon Sep 17 00:00:00 2001
From: adustman <adustman@9fc6cd9a-920d-0410-adcf-ac96716ed7e8>
Date: Sat, 25 Feb 2006 00:43:09 +0000
Subject: [PATCH] Don't convert binary varchar columns to unicode. Patch
 1387290

---
 MySQLdb/MySQLdb/connections.py | 4 ++--
 MySQLdb/MySQLdb/converters.py  | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/MySQLdb/MySQLdb/connections.py b/MySQLdb/MySQLdb/connections.py
index 0c1304a..4131977 100644
--- a/MySQLdb/MySQLdb/connections.py
+++ b/MySQLdb/MySQLdb/connections.py
@@ -138,8 +138,8 @@ class Connection(_mysql.connection):
         if use_unicode:
             def u(s):
                 return s.decode(self.charset)
-            conv[FIELD_TYPE.STRING] = u
-            conv[FIELD_TYPE.VAR_STRING] = u
+            conv[FIELD_TYPE.STRING].insert(-1, (None, u))
+            conv[FIELD_TYPE.VAR_STRING].insert(-1, (None, u))
             conv[FIELD_TYPE.BLOB].insert(-1, (None, u))
 
         def string_literal(obj, dummy=None):
diff --git a/MySQLdb/MySQLdb/converters.py b/MySQLdb/MySQLdb/converters.py
index 51182f4..da2ed46 100644
--- a/MySQLdb/MySQLdb/converters.py
+++ b/MySQLdb/MySQLdb/converters.py
@@ -141,6 +141,14 @@ conversions = {
         (FLAG.BINARY, char_array),
         (None, None),
     ],
+    FIELD_TYPE.STRING: [
+        (FLAG.BINARY, char_array),
+        (None, None),
+    ],
+    FIELD_TYPE.VAR_STRING: [
+        (FLAG.BINARY, char_array),
+        (None, None),
+    ],
     }
 
 try: