From 418518c0b1b0eaabaa184ab514bf1594eaa682c2 Mon Sep 17 00:00:00 2001
From: Alexey Botchkov <holyfoot@askmonty.org>
Date: Wed, 27 Jan 2016 16:42:42 +0400
Subject: [PATCH] MDEV-5273 Prepared statement doesn't return metadata after
 prepare.         Keep the embedded-server version valid.

---
 sql/sql_prepare.cc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 8497d712b80..7757b8da159 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -1871,6 +1871,7 @@ static bool mysql_test_show_create_db(Prepared_statement *stmt)
 }
 
 
+#ifndef NO_EMBEDDED_ACCESS_CHECKS
 /**
   Validate and prepare for execution SHOW GRANTS statement.
 
@@ -1892,8 +1893,10 @@ static bool mysql_test_show_grants(Prepared_statement *stmt)
     
   DBUG_RETURN(send_stmt_metadata(thd, stmt, &fields));
 }
+#endif /*NO_EMBEDDED_ACCESS_CHECKS*/
 
 
+#ifndef EMBEDDED_LIBRARY
 /**
   Validate and prepare for execution SHOW SLAVE STATUS statement.
 
@@ -1962,6 +1965,8 @@ static bool mysql_test_show_binlogs(Prepared_statement *stmt)
   DBUG_RETURN(send_stmt_metadata(thd, stmt, &fields));
 }
 
+#endif /* EMBEDDED_LIBRARY */
+
 
 /**
   Validate and prepare for execution SHOW CREATE PROC/FUNC statement.
@@ -2333,6 +2338,7 @@ static bool check_prepared_statement(Prepared_statement *stmt)
       DBUG_RETURN(FALSE);
     }
     break;
+#ifndef NO_EMBEDDED_ACCESS_CHECKS
   case SQLCOM_SHOW_GRANTS:
     if (!(res= mysql_test_show_grants(stmt)))
     {
@@ -2340,6 +2346,8 @@ static bool check_prepared_statement(Prepared_statement *stmt)
       DBUG_RETURN(FALSE);
     }
     break;
+#endif /* NO_EMBEDDED_ACCESS_CHECKS */
+#ifndef EMBEDDED_LIBRARY
   case SQLCOM_SHOW_SLAVE_STAT:
     if (!(res= mysql_test_show_slave_status(stmt)))
     {
@@ -2361,6 +2369,7 @@ static bool check_prepared_statement(Prepared_statement *stmt)
       DBUG_RETURN(FALSE);
     }
     break;
+#endif /* EMBEDDED_LIBRARY */
   case SQLCOM_SHOW_CREATE_PROC:
     if (!(res= mysql_test_show_create_routine(stmt, TYPE_ENUM_PROCEDURE)))
     {