diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-10-26 15:06:17 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-10-26 15:06:17 +0200 |
| commit | da7447031014917eb7208a8056740d5662662b8f (patch) | |
| tree | d570d9ab24fa41620dd9991ea843e1c7e05c1bcf /sql/sql_prepare.cc | |
| parent | 83b54bb75f98268fef97d4651488bc1f2f4b2d9e (diff) | |
| parent | da333cb434fe062c89fd65fcb930ed408e50040a (diff) | |
| download | mariadb-git-da7447031014917eb7208a8056740d5662662b8f.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug12258/my50-bug12258
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 865c597e00d..5ee8b2642cf 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -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 */ |