bk commit into 4.1 tree (tsmith:1.2604)

[tim]

Below is the list of changes that have just been committed into a local
4.1 repository of tsmith. When tsmith 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@stripped, 2007-02-08 16:01:13-07:00, tsmith@stripped +1 -0
  Merge siva.hindu.god:/home/tsmith/m/bk/41
  into  siva.hindu.god:/home/tsmith/m/bk/maint/41
  MERGE: 1.2601.1.3

  sql/sql_prepare.cc@stripped, 2007-02-08 16:01:12-07:00, tsmith@stripped +0 -2
    Manual merge
    MERGE: 1.159.1.2

# 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:	tsmith
# Host:	siva.hindu.god
# Root:	/home/tsmith/m/bk/maint/41/RESYNC

--- 1.160/sql/sql_prepare.cc	2007-02-05 08:09:42 -07:00
+++ 1.161/sql/sql_prepare.cc	2007-02-08 16:01:12 -07:00
@@ -1791,7 +1791,7 @@
   */
   String expanded_query;
 #ifndef EMBEDDED_LIBRARY
-  uchar *packet_end= (uchar *) packet + packet_length - 1;
+  uchar *packet_end= packet + packet_length - 1;
 #endif
   Prepared_statement *stmt;
   DBUG_ENTER("mysql_stmt_execute");
@@ -1817,9 +1817,9 @@
 #ifndef EMBEDDED_LIBRARY
   if (stmt->param_count)
   {
-    uchar *null_array= (uchar *) packet;
-    if (setup_conversion_functions(stmt, (uchar **) &packet, packet_end) ||
-        stmt->set_params(stmt, null_array, (uchar *) packet, packet_end,
+    uchar *null_array= packet;
+    if (setup_conversion_functions(stmt, &packet, packet_end) ||
+        stmt->set_params(stmt, null_array, packet, packet_end,
                          &expanded_query))
       goto set_params_data_err;
   }