diff options
| -rw-r--r-- | mysql-test/t/mysqladmin.test | 2 | ||||
| -rw-r--r-- | sql/sql_prepare.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/mysqladmin.test b/mysql-test/t/mysqladmin.test index 850abc1ee69..3fa03fa910e 100644 --- a/mysql-test/t/mysqladmin.test +++ b/mysql-test/t/mysqladmin.test @@ -1,3 +1,5 @@ +# Embedded server doesn't support external clients +--source include/not_embedded.inc # # Test "mysqladmin ping" # diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 7f8239c654b..e9f33a172c4 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1252,7 +1252,6 @@ static int mysql_test_select(Prepared_statement *stmt, lex->select_lex.context.resolve_in_select_list= TRUE; -#ifndef NO_EMBEDDED_ACCESS_CHECKS ulong privilege= lex->exchange ? SELECT_ACL | FILE_ACL : SELECT_ACL; if (tables) { @@ -1261,7 +1260,6 @@ static int mysql_test_select(Prepared_statement *stmt, } else if (check_access(thd, privilege, any_db,0,0,0,0)) goto error; -#endif if (!lex->result && !(lex->result= new (stmt->mem_root) select_send)) { |