Commit 6de3acec authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/d2/hf/common/my50-common


mysql-test/t/mysqladmin.test:
  Auto merged
sql/item_func.cc:
  Auto merged
libmysqld/lib_sql.cc:
  merging
mysql-test/t/distinct.test:
  merging
sql/sql_prepare.cc:
  SCCS merged
parents 84d0cda4 4a124185

mysql-test/t/mysqladmin.test

+2 −0
Original line number Diff line number Diff line 
# Embedded server doesn't support external clients

--source include/not_embedded.inc

#

# Test "mysqladmin ping"

#

sql/sql_prepare.cc

+0 −2
Original line number Diff line number Diff line
@@ -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))

  {