Skip to content

M
mariadb
Commit 726a51bc authored by holyfoot/hf@mysql.com/hfmain.(none)'s avatar holyfoot/hf@mysql.com/hfmain.(none)
Browse files
Options

Merge mysql.com:/d2/hf/common/my41-common 

into  mysql.com:/d2/hf/common/my50-common
parents 874d3665 998167ac
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
mysql-test/t/mysqladmin.test
View file @ 726a51bc
# Embedded server doesn't support external clients
--source include/not_embedded.inc
# #
# Test "mysqladmin ping" # Test "mysqladmin ping"
# #
......
sql/sql_prepare.cc
View file @ 726a51bc
...@@ -1252,7 +1252,6 @@ static int mysql_test_select(Prepared_statement *stmt, ...@@ -1252,7 +1252,6 @@ static int mysql_test_select(Prepared_statement *stmt,
lex->select_lex.context.resolve_in_select_list= TRUE; lex->select_lex.context.resolve_in_select_list= TRUE;
#ifndef NO_EMBEDDED_ACCESS_CHECKS
ulong privilege= lex->exchange ? SELECT_ACL | FILE_ACL : SELECT_ACL; ulong privilege= lex->exchange ? SELECT_ACL | FILE_ACL : SELECT_ACL;
if (tables) if (tables)
{ {
...@@ -1261,7 +1260,6 @@ static int mysql_test_select(Prepared_statement *stmt, ...@@ -1261,7 +1260,6 @@ static int mysql_test_select(Prepared_statement *stmt,
} }
else if (check_access(thd, privilege, any_db,0,0,0,0)) else if (check_access(thd, privilege, any_db,0,0,0,0))
goto error; goto error;
#endif
if (!lex->result && !(lex->result= new (stmt->mem_root) select_send)) if (!lex->result && !(lex->result= new (stmt->mem_root) select_send))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7