database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge branch '10.0' into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2018-12-06 15:08:42 +01:00
parent 328d7779bc daca7e70d7
commit 6491c591b2
8 changed files with 159 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/sql_array.h
View File

@ -114,8 +114,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));
}
/**
@ -208,6 +207,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();
@ -230,6 +234,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)
@ -237,7 +246,7 @@ public:
my_qsort(array.buffer, array.elements, sizeof(Elem), (qsort_cmp)cmp_func);
}
typedef int (*CMP_FUNC2)(const Elem *el1, const Elem *el2, void *);
typedef int (*CMP_FUNC2)(void *, const Elem *el1, const Elem *el2);
void sort(CMP_FUNC2 cmp_func, void *data)
{
my_qsort2(array.buffer, array.elements, sizeof(Elem), (qsort2_cmp)cmp_func, data);