database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 5.3->5.5.

Browse Source
This commit is contained in:
Igor Babaev
2012-03-01 14:22:22 -08:00
parent 29b0b0b5de 000deedf3b
commit 8b469eb515
53 changed files with 1174 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_union.cc
View File

@@ -59,9 +59,17 @@ int select_union::send_data(List<Item> &values)
unit->offset_limit_cnt--;
return 0;
}
if (table->no_rows_with_nulls)
table->null_catch_flags= CHECK_ROW_FOR_NULLS_TO_REJECT;
fill_record(thd, table->field, values, TRUE, FALSE);
if (thd->is_error())
return 1;
if (table->no_rows_with_nulls)
{
table->null_catch_flags&= ~CHECK_ROW_FOR_NULLS_TO_REJECT;
if (table->null_catch_flags)
return 0;
}
if ((write_err= table->file->ha_write_tmp_row(table->record[0])))
{