Commit 09eb2bce authored by kostja@bodhi.(none)'s avatar kostja@bodhi.(none)
Browse files

Merge bodhi.(none):/opt/local/work/mysql-5.1-runtime 

into  bodhi.(none):/opt/local/work/mysql-5.1-27430
parents 06443747 7334f7c2

libmysqld/lib_sql.cc

+2 −2
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static int emb_stmt_execute(MYSQL_STMT *stmt) 
  my_bool res;



  int4store(header, stmt->stmt_id);

  header[4]= stmt->flags;

  header[4]= (uchar) stmt->flags;

  thd= (THD*)stmt->mysql->thd;

  thd->client_param_count= stmt->param_count;

  thd->client_params= stmt->params;
@@ -848,7 +848,7 @@ void Protocol_text::remove_last_row() 
{

  MYSQL_DATA *data= thd->cur_data;

  MYSQL_ROWS **last_row_hook= &data->data;

  uint count= data->rows;

  my_ulonglong count= data->rows;

  DBUG_ENTER("Protocol_text::remove_last_row");

  while (--count)

    last_row_hook= &(*last_row_hook)->next;