summaryrefslogtreecommitdiff
path: root/sql/sql_prepare.cc
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@askmonty.org>2016-01-27 16:42:42 +0400
committerAlexey Botchkov <holyfoot@askmonty.org>2016-01-28 11:12:04 +0400
commit418518c0b1b0eaabaa184ab514bf1594eaa682c2 (patch)
tree14a5596ef420d4d0569859a52062661c1e8d10ad /sql/sql_prepare.cc
parentd16d40be2c47d8be5360ae7604f0199635dc0063 (diff)
downloadmariadb-git-418518c0b1b0eaabaa184ab514bf1594eaa682c2.tar.gz
MDEV-5273 Prepared statement doesn't return metadata after prepare.
Keep the embedded-server version valid.
Diffstat (limited to 'sql/sql_prepare.cc')
-rw-r--r--sql/sql_prepare.cc9
1 files changed, 9 insertions, 0 deletions
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)))
{