diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-10 13:03:01 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-10 13:03:01 +0200 |
commit | 6aec87544c675751141100d6efe3a2d943cb528f (patch) | |
tree | 8771c79790e0b58df172e48214a5077899a9b312 /sql/sql_base.h | |
parent | 70a515df434a57709eaf69f451c22739d7908ba4 (diff) | |
parent | c41c79650aa2ef8eaf3f887b94db8cc7478eadd1 (diff) | |
download | mariadb-git-6aec87544c675751141100d6efe3a2d943cb528f.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'sql/sql_base.h')
-rw-r--r-- | sql/sql_base.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h index 5b449fdddac..0bfef1ca7ee 100644 --- a/sql/sql_base.h +++ b/sql/sql_base.h @@ -394,7 +394,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, |