Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0

into neptunus.(none):/home/msvensson/mysql/bug12258/my50-bug12258

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug12258/my50-bug12258
905658fc · msvensson@neptunus.(none) · cd059213 · b8fdad5d · 905658fc
Commit 905658fc authored Oct 26, 2005 by msvensson@neptunus.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/sql_prepare.cc sql/sql_prepare.cc +2 -1

No files found.
--- 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 */