From: Date: May 30 2007 1:39pm
Subject: bk commit into 5.0 tree (gshchepa:1.2507) BUG#28716
List-Archive: http://lists.mysql.com/commits/27672
X-Bug: 28716
Message-Id: <20070530113932.311173D46A2@localhost.localdomain>

Below is the list of changes that have just been committed into a local
5.0 repository of uchum. When uchum 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-05-30 16:39:25+05:00, gshchepa@stripped +1 -0
  sql_update.cc:
    Fixed bug #28716: additional patch to eliminate compilation
    error under Windows.

  sql/sql_update.cc@stripped, 2007-05-30 16:37:36+05:00, gshchepa@stripped +3 -2
    Fixed bug #28716: additional patch to eliminate compilation
    error under Windows.

# 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:	gshchepa
# Host:	gleb.loc
# Root:	/home/uchum/work/bk/mysql-5.0-opt-28716

--- 1.218/sql/sql_update.cc	2007-05-30 12:18:58 +05:00
+++ 1.219/sql/sql_update.cc	2007-05-30 16:37:36 +05:00
@@ -1529,8 +1529,9 @@ int multi_update::do_updates(bool from_s
       uint field_num= 0;
       do
       {
-        if((local_error= tbl->file->rnd_pos(tbl->record[0],
-                                            tmp_table->field[field_num]->ptr)))
+        if((local_error=
+              tbl->file->rnd_pos(tbl->record[0],
+                                (byte *) tmp_table->field[field_num]->ptr)))
           goto err;
         field_num++;
       } while((tbl= check_opt_it++));