1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merge 10.4 into 10.5

This commit is contained in:
Marko Mäkelä
2023-02-10 12:02:11 +02:00
277 changed files with 2048 additions and 1500 deletions

View File

@@ -36,8 +36,8 @@ public:
static Create_func_trt<TRT_FIELD> s_singleton;
protected:
Create_func_trt<TRT_FIELD>() {}
virtual ~Create_func_trt<TRT_FIELD>() {}
Create_func_trt<TRT_FIELD>() = default;
virtual ~Create_func_trt<TRT_FIELD>() = default;
};
template<TR_table::field_id_t TRT_FIELD>
@@ -132,8 +132,8 @@ public:
static Create_func_trt_trx_sees<Item_func_trt_trx_seesX> s_singleton;
protected:
Create_func_trt_trx_sees<Item_func_trt_trx_seesX>() {}
virtual ~Create_func_trt_trx_sees<Item_func_trt_trx_seesX>() {}
Create_func_trt_trx_sees<Item_func_trt_trx_seesX>() = default;
virtual ~Create_func_trt_trx_sees<Item_func_trt_trx_seesX>() = default;
};
template<class X>