database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge branch '10.1' of ../10.1-mdev334 into 10.1

Browse Source
This commit is contained in:
Igor Babaev
2014-10-17 14:06:54 -07:00
parent aa0fd5ca53 a4d1783aae
commit ec89abfef4
5 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_union.cc
View File

@@ -247,6 +247,7 @@ int select_union_direct::send_data(List<Item> &items)
return false;
}
send_records++;
fill_record(thd, table, table->field, items, true, false);
if (thd->is_error())
return true; /* purecov: inspected */