Skip to content

Commit b10ec1b

Browse files
committed
WL#9271: Mysqlx authentication of users using SHA256-auth-plugin
Post-push fix: Fix Clang build warnings due to inconsistent usage of the "override" keyword.
1 parent 0f06c02 commit b10ec1b

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

rapid/plugin/x/ngs/include/ngs/client.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ namespace ngs
4949
Protocol_monitor_interface &pmon);
5050
virtual ~Client();
5151

52-
Mutex &get_session_exit_mutex() { return m_session_exit_mutex; }
53-
ngs::shared_ptr<Session_interface> session() { return m_session; }
52+
Mutex &get_session_exit_mutex() override { return m_session_exit_mutex; }
53+
ngs::shared_ptr<Session_interface> session() override { return m_session; }
5454

5555
public: // impl ngs::Client_interface
5656
void run(const bool skip_resolve_name) override;

rapid/plugin/x/src/xpl_resultset.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ class Process_resultset : public ngs::Resultset_interface {
3636
ngs::Command_delegate &get_callbacks() override {
3737
return m_callback_delegate;
3838
}
39-
const Info &get_info() const { return m_callback_delegate.get_info(); }
39+
const Info &get_info() const override
40+
{ return m_callback_delegate.get_info(); }
4041

4142
private:
4243
Callback_command_delegate m_callback_delegate;
@@ -59,7 +60,8 @@ class Collect_resultset : public ngs::Resultset_interface {
5960
return m_buffering_delegate;
6061
}
6162

62-
const Info &get_info() const { return m_buffering_delegate.get_info(); }
63+
const Info &get_info() const override
64+
{ return m_buffering_delegate.get_info(); }
6365

6466
void reset() { m_buffering_delegate.reset(); }
6567

@@ -91,7 +93,8 @@ class Streaming_resultset : public ngs::Resultset_interface {
9193
ngs::Command_delegate &get_callbacks() override {
9294
return m_streaming_delegate;
9395
}
94-
const Info &get_info() const { return m_streaming_delegate.get_info(); }
96+
const Info &get_info() const override
97+
{ return m_streaming_delegate.get_info(); }
9598

9699
private:
97100
Streaming_command_delegate m_streaming_delegate;

rapid/plugin/x/src/xpl_session.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ class Session : public ngs::Session
6464
virtual ~Session();
6565

6666
public: // impl ngs::Session_interface
67-
ngs::Error_code init();
68-
virtual void on_auth_success(const ngs::Authentication_interface::Response &response);
69-
virtual void on_auth_failure(const ngs::Authentication_interface::Response &response);
67+
ngs::Error_code init() override;
68+
virtual void on_auth_success(const ngs::Authentication_interface::Response &response) override;
69+
virtual void on_auth_failure(const ngs::Authentication_interface::Response &response) override;
7070

71-
virtual void mark_as_tls_session();
72-
virtual bool is_handled_by(const void *handler) const;
71+
virtual void mark_as_tls_session() override;
72+
virtual bool is_handled_by(const void *handler) const override;
7373
ngs::Sql_session_interface &data_context() override { return m_sql; }
7474

7575
public:
@@ -87,8 +87,8 @@ class Session : public ngs::Session
8787
Common_status_variables::*variable);
8888

8989
private: // reimpl ngs::Session
90-
virtual void on_kill();
91-
virtual bool handle_ready_message(ngs::Request &command);
90+
virtual void on_kill() override;
91+
virtual bool handle_ready_message(ngs::Request &command) override;
9292

9393
private:
9494
Sql_data_context m_sql;

rapid/unittest/gunit/xplugin/sasl_plain_auth_t.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ namespace {
3131
const char *const EMPTY = "";
3232
const char *const AUTH_DATA = "ALA_MA_KOTA";
3333
const char *const MECHANISM = "MYSQL41";
34-
const char *const SALT = "SALT";
3534

3635
AssertionResult assert_responce(
3736
const char *e1_expr, const char *e2_expr,

0 commit comments

Comments
 (0)