summaryrefslogtreecommitdiff
path: root/sql/sql_array.h
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2021-03-19 18:15:23 +0200
committerMonty <monty@mariadb.org>2021-03-20 21:17:32 +0200
commitcccc96d66c2aacb9939c8c1389b38317ad601956 (patch)
treeec1473141a800f3ff3e11c2368160cccc32bb6a7 /sql/sql_array.h
parent8f33f49ebea4ecea2953a8b16f2da59cfbd84e37 (diff)
downloadmariadb-git-cccc96d66c2aacb9939c8c1389b38317ad601956.tar.gz
Fixed wrong initializations of Dynamic_array
Other things: - Added size() function to Dynamic_array()
Diffstat (limited to 'sql/sql_array.h')
-rw-r--r--sql/sql_array.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_array.h b/sql/sql_array.h
index b6de1b18d78..8610e971016 100644
--- a/sql/sql_array.h
+++ b/sql/sql_array.h
@@ -112,7 +112,7 @@ private:
template <class Elem> class Dynamic_array
{
- DYNAMIC_ARRAY array;
+ DYNAMIC_ARRAY array;
public:
Dynamic_array(PSI_memory_key psi_key, uint prealloc=16, uint increment=16)
{
@@ -170,6 +170,8 @@ public:
return ((const Elem*)array.buffer) + array.elements - 1;
}
+ size_t size() const { return array.elements; }
+
const Elem *end() const
{
return back() + 1;