From e371b1e2648f043f1bd27f416b0c52f083cbb410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Fri, 24 Mar 2023 15:12:08 +0200 Subject: [PATCH] MDEV-28883 fixup: clang -Winconsistent-missing-override --- sql/sql_delete.h | 4 ++-- sql/sql_update.h | 4 ++-- storage/columnstore/columnstore | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sql/sql_delete.h b/sql/sql_delete.h index ad018ed686c..1842c5c04c7 100644 --- a/sql/sql_delete.h +++ b/sql/sql_delete.h @@ -53,14 +53,14 @@ public: return orig_multitable ? SQLCOM_DELETE_MULTI : SQLCOM_DELETE; } - DML_prelocking_strategy *get_dml_prelocking_strategy() + DML_prelocking_strategy *get_dml_prelocking_strategy() override { return &dml_prelocking_strategy; } bool processing_as_multitable_delete_prohibited(THD *thd); - bool is_multitable() { return multitable; } + bool is_multitable() const { return multitable; } void set_as_multitable() { multitable= true; } diff --git a/sql/sql_update.h b/sql/sql_update.h index bd7d58cf97d..d01ecb7354a 100644 --- a/sql/sql_update.h +++ b/sql/sql_update.h @@ -54,14 +54,14 @@ public: return orig_multitable ? SQLCOM_UPDATE_MULTI : SQLCOM_UPDATE; } - DML_prelocking_strategy *get_dml_prelocking_strategy() + DML_prelocking_strategy *get_dml_prelocking_strategy() override { return &multiupdate_prelocking_strategy; } bool processing_as_multitable_update_prohibited(THD *thd); - bool is_multitable() { return multitable; } + bool is_multitable() const { return multitable; } void set_as_multitable() { multitable= true; } diff --git a/storage/columnstore/columnstore b/storage/columnstore/columnstore index 58da5eea954..b989238ff79 160000 --- a/storage/columnstore/columnstore +++ b/storage/columnstore/columnstore @@ -1 +1 @@ -Subproject commit 58da5eea954dbbce8c954c323dd2c8247e54303e +Subproject commit b989238ff79969f86ffee66620495d57c8c00691