Commit 3c9be169 authored by unknown's avatar unknown
Browse files

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

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


libmysqld/lib_sql.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
parents cbff25d0 1c48d723

libmysqld/lib_sql.cc

+4 −0
Original line number Diff line number Diff line
@@ -306,7 +306,11 @@ int emb_read_binary_rows(MYSQL_STMT *stmt) 
{

  MYSQL_DATA *data;

  if (!(data= emb_read_rows(stmt->mysql, 0, 0)))

  {

    set_stmt_errmsg(stmt, stmt->mysql->net.last_error,

                    stmt->mysql->net.last_errno, stmt->mysql->net.sqlstate);

    return 1;

  }

  stmt->result= *data;

  my_free((char *) data, MYF(0));

  set_stmt_errmsg(stmt, stmt->mysql->net.last_error,

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
@@ -1253,7 +1253,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)

  {
@@ -1262,7 +1261,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))

  {