1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
This commit is contained in:
msvensson@pilot.mysql.com
2007-02-13 10:27:39 +01:00
2 changed files with 7 additions and 1 deletions

View File

@@ -2240,7 +2240,7 @@ static void reset_stmt_params(Prepared_statement *stmt)
void mysql_stmt_execute(THD *thd, char *packet_arg, uint packet_length)
{
uchar* packet= (uchar*)packet_arg; // gcc 4.0 stgrict-aliasing
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 */