Skip to content

Commit

Permalink
MDEV-28883 fixup: clang -Winconsistent-missing-override
Browse files Browse the repository at this point in the history
  • Loading branch information
dr-m committed Mar 24, 2023
1 parent 9aa098c commit e371b1e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions sql/sql_delete.h
Expand Up @@ -53,14 +53,14 @@ class Sql_cmd_delete final : public Sql_cmd_dml
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; }

Expand Down
4 changes: 2 additions & 2 deletions sql/sql_update.h
Expand Up @@ -54,14 +54,14 @@ class Sql_cmd_update final : public Sql_cmd_dml
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; }

Expand Down
2 changes: 1 addition & 1 deletion storage/columnstore/columnstore
Submodule columnstore updated 48 files
+25 −12 .drone.jsonnet
+0 −17 dbcon/mysql/ha_mcs.h
+2 −12 dbcon/mysql/ha_mcs_execplan.cpp
+0 −1 mysql-test/columnstore/basic/disabled.def
+4 −6 mysql-test/columnstore/basic/t/mcol641-create.test
+0 −4 mysql-test/columnstore/basic/t/mcol_2000.test
+0 −2 mysql-test/columnstore/basic/t/mcs117_create_utf8.test
+5 −10 mysql-test/columnstore/basic/t/mcs118_charset_negative.test
+0 −9 mysql-test/columnstore/basic/t/mcs12_alter_table.test
+0 −2 mysql-test/columnstore/basic/t/mcs13_alter_table_negative.test
+0 −1 mysql-test/columnstore/basic/t/mcs169_bin_functions.test
+1 −5 mysql-test/columnstore/basic/t/mcs16_functions_define_call_drop.test
+0 −1 mysql-test/columnstore/basic/t/mcs171_null_functions.test
+0 −1 mysql-test/columnstore/basic/t/mcs173_coalesce_function.test
+0 −1 mysql-test/columnstore/basic/t/mcs174_case_function.test
+0 −1 mysql-test/columnstore/basic/t/mcs175_convert_functions.test
+0 −1 mysql-test/columnstore/basic/t/mcs176_if_function.test
+0 −1 mysql-test/columnstore/basic/t/mcs178_adddate_function.test
+0 −1 mysql-test/columnstore/basic/t/mcs179_addtime_function.test
+0 −1 mysql-test/columnstore/basic/t/mcs180_ascii_function.test
+0 −1 mysql-test/columnstore/basic/t/mcs181_between_and.test
+0 −2 mysql-test/columnstore/basic/t/mcs182_char_length_function.test
+0 −1 mysql-test/columnstore/basic/t/mcs183_date_function.test
+0 −1 mysql-test/columnstore/basic/t/mcs184_day_function.test
+0 −1 mysql-test/columnstore/basic/t/mcs185_dayname_function.test
+0 −1 mysql-test/columnstore/basic/t/mcs186_dayofyear_function.test
+0 −1 mysql-test/columnstore/basic/t/mcs187_dayofmonth_function.test
+3 −6 mysql-test/columnstore/basic/t/mcs19_grant_revoke.test
+0 −5 mysql-test/columnstore/basic/t/mcs1_create_table_data_types.test
+0 −2 mysql-test/columnstore/basic/t/mcs229_data_compression_type.test
+0 −1 mysql-test/columnstore/basic/t/mcs28_load_data_local_infile.test
+0 −8 mysql-test/columnstore/basic/t/mcs2_create_table_valid_names.test
+0 −18 mysql-test/columnstore/basic/t/mcs5_create_table_from_other_tables.test
+2 −4 mysql-test/columnstore/basic/t/mcs69_cast_data_types.test
+0 −3 mysql-test/columnstore/basic/t/mcs74_check_constraint.test
+0 −3 mysql-test/columnstore/basic/t/mcs7_create_table_with_metadata.test
+0 −1 mysql-test/columnstore/basic/t/mcs87_alter_column.test
+0 −3 mysql-test/columnstore/basic/t/mcs8_create_table_with_constraints.test
+5 −5 mysql-test/columnstore/compat/oracle/func_concat_oracle.result
+1 −1 mysql-test/columnstore/csinternal/devregression/r/mcs7631_q111.result
+1 −1 mysql-test/columnstore/csinternal/devregression/r/mcs7632_q112.result
+1 −1 mysql-test/columnstore/csinternal/devregression/r/mcs7633_q113.result
+1 −1 mysql-test/columnstore/csinternal/devregression/r/mcs7634_q211.result
+1 −1 mysql-test/columnstore/csinternal/devregression/r/mcs7635_q212.result
+2 −2 mysql-test/columnstore/csinternal/devregression/r/mcs7636_q213.result
+1 −1 mysql-test/columnstore/csinternal/regression_env_setup.test
+0 −4 utils/funcexp/func_lcase.cpp
+1 −5 utils/funcexp/func_ucase.cpp

0 comments on commit e371b1e

Please sign in to comment.