diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-10-28 19:10:05 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-10-28 19:10:05 +0200 |
| commit | 82f1e3d3cb0b707463eb20337871b20a0f6d20f2 (patch) | |
| tree | 17de931b3bff2a417ae74c2ed3ae57660c21aa91 /sql/sql_prepare.cc | |
| parent | fbb2fd3e581170dca52c1f92a2474312423f66f4 (diff) | |
| parent | a62c4bdedf9f081b909601ec8232c8605cf5f68b (diff) | |
| download | mariadb-git-82f1e3d3cb0b707463eb20337871b20a0f6d20f2.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 67fb8245c58..0d0afb5ca7d 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2172,8 +2172,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 */ |