diff options
| author | msvensson@pilot.mysql.com <> | 2007-02-13 09:56:56 +0100 |
|---|---|---|
| committer | msvensson@pilot.mysql.com <> | 2007-02-13 09:56:56 +0100 |
| commit | 818cb094fc43495f8b6e342ff8300796d8458078 (patch) | |
| tree | d542ef5023103a0ca1f2557b7665a8221bbf9f3b /sql/sql_prepare.cc | |
| parent | 293352cbe4a8fb089189025c9d1ed194436ceec4 (diff) | |
| parent | 8dc8e07fcf38365eb268d3ce3edbdf29bde89323 (diff) | |
| download | mariadb-git-818cb094fc43495f8b6e342ff8300796d8458078.tar.gz | |
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 687e96ba9cb..a77f68e886e 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2202,7 +2202,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 */ |