1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

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

into  host.loc:/work/bk/5.1-bugteam
This commit is contained in:
gshchepa/uchum@host.loc
2008-05-18 14:27:44 +05:00
4 changed files with 113 additions and 0 deletions

View File

@ -1669,6 +1669,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++));