summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-03-17 13:29:59 +0200
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-03-17 13:29:59 +0200
commit4f836ca3729007476a43c465b6fd0c5a4da4c76d (patch)
tree184f4ec1af0362600a0968314437e2243590bfc9 /sql/sql_acl.cc
parentdcb44a9468cb18799068c66f8bb829bfd0491c0b (diff)
downloadmariadb-git-4f836ca3729007476a43c465b6fd0c5a4da4c76d.tar.gz
Fixed a post-merge embedded compilation error
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r--sql/sql_acl.cc2
1 files changed, 2 insertions, 0 deletions
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() */