diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-24 15:12:08 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-24 15:12:08 +0200 |
| commit | e371b1e2648f043f1bd27f416b0c52f083cbb410 (patch) | |
| tree | 99a4ec1014891de41552134b6d2bd5ebcedcee5a | |
| parent | 9aa098c46b422149b0459e817a76aa058a7be08c (diff) | |
| download | mariadb-git-e371b1e2648f043f1bd27f416b0c52f083cbb410.tar.gz | |
MDEV-28883 fixup: clang -Winconsistent-missing-override
| -rw-r--r-- | sql/sql_delete.h | 4 | ||||
| -rw-r--r-- | sql/sql_update.h | 4 | ||||
| m--------- | storage/columnstore/columnstore | 0 |
3 files changed, 4 insertions, 4 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 -Subproject 58da5eea954dbbce8c954c323dd2c8247e54303 +Subproject b989238ff79969f86ffee66620495d57c8c0069 |