diff options
author | Sergei Golubchik <serg@mariadb.org> | 2018-12-06 00:48:00 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2018-12-06 14:22:07 +0100 |
commit | 8a37ce07672df44d06c0ea7b66e0c3136b1e6ab0 (patch) | |
tree | 973f9864a7855646d96e89c4aa14d5141db63f8d /sql/sql_array.h | |
parent | 17e85702856775faad43beb8aedf3088e8f34da6 (diff) | |
download | mariadb-git-8a37ce07672df44d06c0ea7b66e0c3136b1e6ab0.tar.gz |
cleanup: DYNAMIC_ARRAY -> Dynamic_array<ACL_DB> acl_dbs
Diffstat (limited to 'sql/sql_array.h')
-rw-r--r-- | sql/sql_array.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/sql/sql_array.h b/sql/sql_array.h index 8202e94ce41..37e86008ef0 100644 --- a/sql/sql_array.h +++ b/sql/sql_array.h @@ -107,8 +107,7 @@ public: void init(uint prealloc=16, uint increment=16) { - my_init_dynamic_array(&array, sizeof(Elem), prealloc, increment, - MYF(0)); + init_dynamic_array2(&array, sizeof(Elem), 0, prealloc, increment, MYF(0)); } /** @@ -201,6 +200,11 @@ public: set_dynamic(&array, &el, idx); } + void freeze() + { + freeze_size(&array); + } + bool resize(size_t new_size, Elem default_val) { size_t old_size= elements(); @@ -223,6 +227,11 @@ public: delete_dynamic(&array); } + void free_memory() + { + delete_dynamic(&array); + } + typedef int (*CMP_FUNC)(const Elem *el1, const Elem *el2); void sort(CMP_FUNC cmp_func) |