MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:msvensson Date:October 26 2005 12:14pm
Subject:bk commit into 4.1 tree (msvensson:1.2457) BUG#12258
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2457 05/10/26 14:14:08 msvensson@neptunus.(none) +1 -0
  Bug #12258 mysql_client_test failure on FC4
   - Fix for gcc 4.0.1, use cast packet arg local variable

  sql/sql_prepare.cc
    1.156 05/10/26 14:14:02 msvensson@neptunus.(none) +2 -1
    Use local variable packet that contains an uchar pointer to packet_arg

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug12258/my41-bug12258

--- 1.155/sql/sql_prepare.cc	2005-09-25 20:22:21 +02:00
+++ 1.156/sql/sql_prepare.cc	2005-10-26 14:14:02 +02:00
@@ -1769,8 +1769,9 @@
       packet_length  Query string length, including terminator character.
 */
 
-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);
   /*
     Query text for binary log, or empty string if the query is not put into
Thread
bk commit into 4.1 tree (msvensson:1.2457) BUG#12258msvensson26 Oct