mirror of
https://github.com/MariaDB/server.git
synced 2025-12-01 17:39:21 +03:00
Conflicts: mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic.result mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic.test mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic.test sql/mysqld.cc
1.8 KiB
1.8 KiB