Merge host.loc:/work/bugs/5.0-bugteam-36676

into  host.loc:/work/bk/5.0-bugteam

1 files changed, 6 insertions, 0 deletions

diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index a8238141f25..6830564111b 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -1440,6 +1440,12 @@ bool multi_update::send_data(List<Item> &not_used_values)
           tbl->file->position(tbl->record[0]);
         memcpy((char*) tmp_table->field[field_num]->ptr,
                (char*) tbl->file->ref, tbl->file->ref_length);
+        /*
+         For outer joins a rowid field may have no NOT_NULL_FLAG,
+         so we have to reset NULL bit for this field.
+         (set_notnull() resets NULL bit only if available).
+        */
+        tmp_table->field[field_num]->set_notnull();
         field_num++;
       } while ((tbl= tbl_it++));