mirror of
https://github.com/MariaDB/server.git
synced 2025-02-02 12:01:42 +01:00
Merge neptunus.(none):/home/msvensson/mysql/bug12258/my50-bug12258
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
This commit is contained in:
commit
268eb66421
1 changed files with 2 additions and 1 deletions
|
@ -2170,8 +2170,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 */
|
||||
|
|
Loading…
Add table
Reference in a new issue