summaryrefslogtreecommitdiff
path: root/storage/innobase/row/row0sel.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-10-28 09:08:58 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-10-28 09:08:58 +0300
commitd8c6c53a0658ea8315252997f65d796b13182387 (patch)
tree26cb3a48c75fb94307ee564185b45fd7d94f80f7 /storage/innobase/row/row0sel.cc
parent1ad1d789815ddada89d8fb557a47a437d1ea21c2 (diff)
parenta8ded395578ccab9c256b9beee7e62d4ada08522 (diff)
downloadmariadb-git-d8c6c53a0658ea8315252997f65d796b13182387.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'storage/innobase/row/row0sel.cc')
-rw-r--r--storage/innobase/row/row0sel.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/row/row0sel.cc b/storage/innobase/row/row0sel.cc
index 4a839082a6b..a6d92cf7361 100644
--- a/storage/innobase/row/row0sel.cc
+++ b/storage/innobase/row/row0sel.cc
@@ -332,7 +332,7 @@ row_sel_sec_rec_is_for_clust_rec(
&heap, NULL, NULL,
thr_get_trx(thr)->mysql_thd,
thr->prebuilt->m_mysql_table,
- record, NULL, NULL, NULL);
+ record, NULL, NULL);
if (vfield == NULL) {
innobase_report_computed_value_failed(row);