database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2023-02-10 12:02:11 +02:00
parent a9eb272f91 cacea31687
commit c41c79650a
277 changed files with 2048 additions and 1500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_base.h
View File

@ -392,7 +392,7 @@ inline bool setup_fields_with_no_wrap(THD *thd, Ref_ptr_array ref_pointer_array,
class Prelocking_strategy
{
public:
virtual ~Prelocking_strategy() { }
virtual ~Prelocking_strategy() = default;
virtual void reset(THD *thd) { };
virtual bool handle_routine(THD *thd, Query_tables_list *prelocking_ctx,