Commit 4a124185 authored by unknown's avatar unknown
Browse files

embedded-server related fixes 


libmysqld/lib_sql.cc:
  error message moved to 'stmt'
mysql-test/t/distinct.test:
  temporary disabled in embedded server
mysql-test/t/mysqladmin.test:
  disabled in embedded server
sql/sql_prepare.cc:
  superfluous #ifndef removed
parent 62576974

libmysqld/lib_sql.cc

+6 −0
Original line number Diff line number Diff line
@@ -249,7 +249,13 @@ int emb_read_binary_rows(MYSQL_STMT *stmt) 
{

  MYSQL_DATA *data;

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

  {

    strmake(stmt->sqlstate, stmt->mysql->net.sqlstate, sizeof(stmt->sqlstate));

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

            sizeof(stmt->last_error));

    stmt->last_errno= stmt->mysql->net.last_errno;

    return 1;

  }

  return 0;

}

mysql-test/t/distinct.test

+2 −0
Original line number Diff line number Diff line 
# test script should specify proper directories for embedded

--source include/not_embedded.inc

#

# Bug with distinct and INSERT INTO

# Bug with group by and not used fields

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
@@ -1063,7 +1063,6 @@ static int mysql_test_select(Prepared_statement *stmt, 
  int result= 1;

  DBUG_ENTER("mysql_test_select");



#ifndef NO_EMBEDDED_ACCESS_CHECKS

  ulong privilege= lex->exchange ? SELECT_ACL | FILE_ACL : SELECT_ACL;

  if (tables)

  {
@@ -1072,7 +1071,6 @@ static int mysql_test_select(Prepared_statement *stmt, 
  }

  else if (check_access(thd, privilege, any_db,0,0,0))

    DBUG_RETURN(1);

#endif



  if (!lex->result && !(lex->result= new (stmt->mem_root) select_send))

  {