Commit da333cb4 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/bug12258/my41-bug12258 

into  neptunus.(none):/home/msvensson/mysql/bug12258/my50-bug12258


sql/sql_prepare.cc:
  Auto merged
parents 8ba28aa3 39e33ddd

sql/sql_prepare.cc

+2 −1
Original line number Diff line number Diff line
@@ -2168,8 +2168,9 @@ static void reset_stmt_params(Prepared_statement *stmt) 
    client, otherwise an error message is set in THD.

*/



void mysql_stmt_execute(THD *thd, char *packet, uint packet_length)

void mysql_stmt_execute(THD *thd, char *packet_arg, uint packet_length)

{

  uchar *packet= (uchar*)packet_arg; // GCC 4.0.1 workaround

  ulong stmt_id= uint4korr(packet);

  ulong flags= (ulong) ((uchar) packet[4]);

  /* Query text for binary, general or slow log, if any of them is open */