summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
diff options
context:
space:
mode:
authorunknown <timour@askmonty.org>2012-10-18 15:57:12 +0300
committerunknown <timour@askmonty.org>2012-10-18 15:57:12 +0300
commit69a7b04add1d8102b9f5add88ae691d8b04727bc (patch)
treed8767b9ac1dd83919fd194feb3e0cb6451064c0a /sql/sql_union.cc
parent807fef40fffbbb8e92564a52b902b504ba8cfcdc (diff)
parentbc4a456758c8077e5377b8cfaed60af4311653a0 (diff)
downloadmariadb-git-69a7b04add1d8102b9f5add88ae691d8b04727bc.tar.gz
Merge mdev-452 with the latest 10.0-base.
Diffstat (limited to 'sql/sql_union.cc')
-rw-r--r--sql/sql_union.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 3f8f6436c17..56f413afbd1 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -63,7 +63,7 @@ int select_union::send_data(List<Item> &values)
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);
+ fill_record(thd, table, table->field, values, TRUE, FALSE);
if (thd->is_error())
return 1;
if (table->no_rows_with_nulls)