Commit a806c993 authored by Oleksandr Byelkin's avatar Oleksandr Byelkin

Fix for compiling under clang.

parent d87979b4
/* -*- C++ -*- */ /* -*- C++ -*- */
/* /*
Copyright (c) 2002, 2011, Oracle and/or its affiliates. Copyright (c) 2002, 2011, Oracle and/or its affiliates.
Copyright (c) 2020, MariaDB Copyright (c) 2020, 2022, MariaDB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
...@@ -1060,7 +1060,7 @@ class sp_lex_cursor: public sp_lex_local, public Query_arena ...@@ -1060,7 +1060,7 @@ class sp_lex_cursor: public sp_lex_local, public Query_arena
~sp_lex_cursor() { free_items(); } ~sp_lex_cursor() { free_items(); }
virtual bool cleanup_stmt(bool /*restore_set_statement_vars*/) override virtual bool cleanup_stmt(bool /*restore_set_statement_vars*/) override
{ return false; } { return false; }
Query_arena *query_arena() { return this; } Query_arena *query_arena() override { return this; }
bool validate() bool validate()
{ {
DBUG_ASSERT(sql_command == SQLCOM_SELECT); DBUG_ASSERT(sql_command == SQLCOM_SELECT);
...@@ -1840,9 +1840,9 @@ class sp_instr_cpush : public sp_instr, public sp_cursor ...@@ -1840,9 +1840,9 @@ class sp_instr_cpush : public sp_instr, public sp_cursor
virtual ~sp_instr_cpush() virtual ~sp_instr_cpush()
{} {}
virtual int execute(THD *thd, uint *nextp); int execute(THD *thd, uint *nextp) override;
virtual void print(String *str); void print(String *str) override;
/** /**
This call is used to cleanup the instruction when a sensitive This call is used to cleanup the instruction when a sensitive
...@@ -1857,7 +1857,7 @@ class sp_instr_cpush : public sp_instr, public sp_cursor ...@@ -1857,7 +1857,7 @@ class sp_instr_cpush : public sp_instr, public sp_cursor
uint m_cursor; /**< Frame offset (for debugging) */ uint m_cursor; /**< Frame offset (for debugging) */
public: public:
virtual PSI_statement_info* get_psi_info() { return & psi_info; } PSI_statement_info* get_psi_info() override { return & psi_info; }
static PSI_statement_info psi_info; static PSI_statement_info psi_info;
}; // class sp_instr_cpush : public sp_instr }; // class sp_instr_cpush : public sp_instr
......
/* Copyright (c) 2002, 2015, Oracle and/or its affiliates. /* Copyright (c) 2002, 2015, Oracle and/or its affiliates.
Copyright (c) 2008, 2021, MariaDB Copyright (c) 2008, 2022, MariaDB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
...@@ -200,8 +200,8 @@ class Prepared_statement: public Statement ...@@ -200,8 +200,8 @@ class Prepared_statement: public Statement
Prepared_statement(THD *thd_arg); Prepared_statement(THD *thd_arg);
virtual ~Prepared_statement(); virtual ~Prepared_statement();
void setup_set_params(); void setup_set_params();
virtual Query_arena::Type type() const; Query_arena::Type type() const override;
virtual bool cleanup_stmt(bool restore_set_statement_vars) override; bool cleanup_stmt(bool restore_set_statement_vars) override;
bool set_name(const LEX_CSTRING *name); bool set_name(const LEX_CSTRING *name);
inline void close_cursor() { delete cursor; cursor= 0; } inline void close_cursor() { delete cursor; cursor= 0; }
inline bool is_in_use() { return flags & (uint) IS_IN_USE; } inline bool is_in_use() { return flags & (uint) IS_IN_USE; }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment