Commit 7f63aab2 authored by gshchepa/uchum@gleb.loc's avatar gshchepa/uchum@gleb.loc
Browse files

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

into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt-28716
parents 9f9d7185 64ff9e4d

sql/sql_update.cc

+3 −2
Original line number Diff line number Diff line
@@ -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++));