summaryrefslogtreecommitdiff
path: root/sql/sql_select.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-03-30 14:50:23 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-03-30 14:50:23 +0300
commite2f1f88fa60680cb87833a7cceb172f5d436a804 (patch)
tree5e48f8ed5c7a169af6692c72de9f1007af48737e /sql/sql_select.h
parent9eae063e79376fd71586e1106e750a366467a984 (diff)
parentb092d35f13ceae37cda26478635b127f9b401e2c (diff)
downloadmariadb-git-e2f1f88fa60680cb87833a7cceb172f5d436a804.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_select.h')
-rw-r--r--sql/sql_select.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h
index b9043a851e7..d41fc3317a3 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -2,7 +2,7 @@
#define SQL_SELECT_INCLUDED
/* Copyright (c) 2000, 2013, Oracle and/or its affiliates.
- Copyright (c) 2008, 2017, MariaDB Corporation.
+ Copyright (c) 2008, 2020, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -1665,6 +1665,9 @@ public:
void copy_ref_ptr_array(Ref_ptr_array dst_arr, Ref_ptr_array src_arr)
{
DBUG_ASSERT(dst_arr.size() >= src_arr.size());
+ if (src_arr.size() == 0)
+ return;
+
void *dest= dst_arr.array();
const void *src= src_arr.array();
memcpy(dest, src, src_arr.size() * src_arr.element_size());