Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt

into gleb.loc:/home/uchum/work/bk/mysql-5.0-opt-28716

Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt
into gleb.loc:/home/uchum/work/bk/mysql-5.0-opt-28716
7f63aab2 · gshchepa/uchum@gleb.loc · 9f9d7185 · 64ff9e4d · 7f63aab2
Commit 7f63aab2 authored May 30, 2007 by gshchepa/uchum@gleb.loc
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

sql/sql_update.cc sql/sql_update.cc +3 -2

No files found.
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -1529,8 +1529,9 @@ int multi_update::do_updates(bool from_send_error)
      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++));