diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 14:42:50 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-10 14:42:50 +0200 |
commit | 92c8d6f168f329bf7e3998a4f580781d0239b59a (patch) | |
tree | 1105d2015a3a7b9e0bed740eaee027cd30e3b5c3 /mysys/array.c | |
parent | 8bddaddc6fcd4f146252c2dc149ecbc51cd6c788 (diff) | |
parent | ab36eac584a0bef4a048a3fd8ae56ff2cbfcb6cc (diff) | |
download | mariadb-git-92c8d6f168f329bf7e3998a4f580781d0239b59a.tar.gz |
Merge 10.7 into 10.8
The MDEV-25004 test innodb_fts.versioning is omitted because ever since
commit 685d958e38b825ad9829be311f26729cccf37c46 InnoDB would not allow
writes to a database where the redo log file ib_logfile0 is missing.
Diffstat (limited to 'mysys/array.c')
-rw-r--r-- | mysys/array.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysys/array.c b/mysys/array.c index aa2f444653f..6e871ee6343 100644 --- a/mysys/array.c +++ b/mysys/array.c @@ -23,6 +23,7 @@ SYNOPSIS init_dynamic_array2() + ps_key Key to register instrumented memory array Pointer to an array element_size Size of element init_buffer Initial buffer pointer |