mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merged 5.1 with maria 5.1

Browse source
This commit is contained in:
Michael Widenius 2008-10-10 18:28:41 +03:00
commit f47e003e1b
1924 changed files with 472176 additions and 152416 deletions
Download patch file Download diff file Expand all files Collapse all files

3
storage/federated/ha_federated.cc
View file

@ -920,7 +920,10 @@ uint ha_federated::convert_row_to_internal_format(uchar *record,
old_ptr= (my_ptrdiff_t) (record - table->record[0]);
(*field)->move_field_offset(old_ptr);
if (!*row)
{
(*field)->set_null();
(*field)->reset();
}
else
{
if (bitmap_is_set(table->read_set, (*field)->field_index))