From c96b82f652b1b3e8dbce7b0f90123beeeefb1b28 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Fri, 4 Oct 2013 13:34:25 +0200
Subject: [PATCH] fix embedded to compile with
 -DHAVE_EMBEDDED_PRIVILEGE_CONTROL

---
 libmysqld/lib_sql.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index ad2163c788c..2c959200457 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -771,15 +771,15 @@ int check_embedded_connection(MYSQL *mysql, const char *db)
 
   if (acl_authenticate(thd, 0, end - buf))
   {
-    x_free(thd->security_ctx->user);
+    my_free(thd->security_ctx->user);
     goto err;
   }
   return 0;
 
 err:
-  strmake_buf(net->last_error, thd->main_da.message());
+  strmake_buf(net->last_error, thd->get_stmt_da()->message());
   memcpy(net->sqlstate,
-         mysql_errno_to_sqlstate(thd->main_da.sql_errno()),
+         mysql_errno_to_sqlstate(thd->get_stmt_da()->sql_errno()),
          sizeof(net->sqlstate)-1);
   return 1;
 }