diff options
| author | Eric Herman <eric@freesa.org> | 2021-09-03 06:38:54 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <cvicentiu@gmail.com> | 2021-10-15 12:14:47 +0300 |
| commit | 0649bcff4e984cb29d9fc12bde7eccb87ea7e38e (patch) | |
| tree | 7459ff3efdcfdfa2ab4094f7ff5b7e5d4332e9a0 /sql/sql_test.cc | |
| parent | a6cf8b34a834e5d16155f8bb3f33d57a4f87eb9e (diff) | |
| download | mariadb-git-bb-10.7-vicentiu.tar.gz | |
MDEV-26221: DYNAMIC_ARRAY use size_t for sizesbb-10.7-vicentiu
https://jira.mariadb.org/browse/MDEV-26221
my_sys DYNAMIC_ARRAY and DYNAMIC_STRING inconsistancy
The DYNAMIC_STRING uses size_t for sizes, but DYNAMIC_ARRAY used uint.
This patch adjusts DYNAMIC_ARRAY to use size_t like DYNAMIC_STRING.
As the MY_DIR member number_of_files is copied from a DYNAMIC_ARRAY,
this is changed to be size_t.
As MY_TMPDIR members 'cur' and 'max' are copied from a DYNAMIC_ARRAY,
these are also changed to be size_t.
The lists of plugins and stored procedures use DYNAMIC_ARRAY,
but their APIs assume a size of 'uint'; these are unchanged.
Diffstat (limited to 'sql/sql_test.cc')
| -rw-r--r-- | sql/sql_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_test.cc b/sql/sql_test.cc index e06600700bb..0d1a8313564 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -264,7 +264,7 @@ static void print_keyuse(KEYUSE *keyuse) void print_keyuse_array(DYNAMIC_ARRAY *keyuse_array) { DBUG_LOCK_FILE; - fprintf(DBUG_FILE, "KEYUSE array (%d elements)\n", keyuse_array->elements); + fprintf(DBUG_FILE, "KEYUSE array (%zu elements)\n", keyuse_array->elements); for(uint i=0; i < keyuse_array->elements; i++) print_keyuse((KEYUSE*)dynamic_array_ptr(keyuse_array, i)); DBUG_UNLOCK_FILE; |