From f9756a6c16ea3343cef50ae8fafc0528896b0c6c Mon Sep 17 00:00:00 2001
From: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
Date: Thu, 17 Mar 2011 13:29:59 +0200
Subject: [PATCH] Fixed a post-merge embedded compilation error

---
 sql/sql_acl.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 09609a7fa0c..9f8510cab03 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -8397,6 +8397,7 @@ static bool parse_com_change_user_packet(MPVIO_EXT *mpvio, uint packet_length)
   DBUG_RETURN (0);
 }
 
+#ifndef EMBEDDED_LIBRARY
 /**
   Get a null character terminated string from a user-supplied buffer.
 
@@ -8481,6 +8482,7 @@ char *get_length_encoded_string(char **buffer,
   *buffer+= *string_length + 1;
   return str;
 }
+#endif
 
 
 /* the packet format is described in send_client_reply_packet() */