5.5 merge

1 files changed, 10 insertions, 0 deletions

diff --git a/sql/sql_string.h b/sql/sql_string.h
index 58cda343dac..9367a25b6be 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -378,6 +378,16 @@ public:
     }
     return 0;
   }
+  bool append_hex(const char *src, uint32 srclen)
+  {
+    for (const char *end= src + srclen ; src != end ; src++)
+    {
+      if (append(_dig_vec_lower[((uchar) *src) >> 4]) ||
+          append(_dig_vec_lower[((uchar) *src) & 0x0F]))
+        return true;
+    }
+    return false;
+  }
   bool fill(uint32 max_length,char fill);
   void strip_sp();
   friend int sortcmp(const String *a,const String *b, CHARSET_INFO *cs);