diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-02-13 09:56:56 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-02-13 09:56:56 +0100 |
| commit | faacf58091aa31878f0e9b6a470a5adcc83a49d2 (patch) | |
| tree | d542ef5023103a0ca1f2557b7665a8221bbf9f3b /sql/sql_prepare.cc | |
| parent | 1c28548966a898ff524d74cade3f975f3bfd5511 (diff) | |
| parent | 8a34c4bb78ca1afe57819c8be276446f01087f11 (diff) | |
| download | mariadb-git-faacf58091aa31878f0e9b6a470a5adcc83a49d2.tar.gz | |
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
BitKeeper/etc/gone:
auto-union
mysys/my_getopt.c:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/table.cc:
Auto merged
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 */ |