Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
a806c993
Commit
a806c993
authored
Feb 04, 2022
by
Oleksandr Byelkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for compiling under clang.
parent
d87979b4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
sql/sp_head.h
sql/sp_head.h
+5
-5
sql/sql_prepare.cc
sql/sql_prepare.cc
+3
-3
No files found.
sql/sp_head.h
View file @
a806c993
/* -*- C++ -*- */
/*
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
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
~
sp_lex_cursor
()
{
free_items
();
}
virtual
bool
cleanup_stmt
(
bool
/*restore_set_statement_vars*/
)
override
{
return
false
;
}
Query_arena
*
query_arena
()
{
return
this
;
}
Query_arena
*
query_arena
()
override
{
return
this
;
}
bool
validate
()
{
DBUG_ASSERT
(
sql_command
==
SQLCOM_SELECT
);
...
...
@@ -1840,9 +1840,9 @@ class sp_instr_cpush : public sp_instr, public sp_cursor
virtual
~
sp_instr_cpush
()
{}
virtual
int
execute
(
THD
*
thd
,
uint
*
nextp
)
;
int
execute
(
THD
*
thd
,
uint
*
nextp
)
override
;
v
irtual
void
print
(
String
*
str
)
;
v
oid
print
(
String
*
str
)
override
;
/**
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
uint
m_cursor
;
/**< Frame offset (for debugging) */
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
;
};
// class sp_instr_cpush : public sp_instr
...
...
sql/sql_prepare.cc
View file @
a806c993
/* Copyright (c) 2002, 2015, Oracle and/or its affiliates.
Copyright (c) 2008, 202
1
, MariaDB
Copyright (c) 2008, 202
2
, MariaDB
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
...
...
@@ -200,8 +200,8 @@ class Prepared_statement: public Statement
Prepared_statement
(
THD
*
thd_arg
);
virtual
~
Prepared_statement
();
void
setup_set_params
();
virtual
Query_arena
::
Type
type
()
const
;
virtual
bool
cleanup_stmt
(
bool
restore_set_statement_vars
)
override
;
Query_arena
::
Type
type
()
const
override
;
bool
cleanup_stmt
(
bool
restore_set_statement_vars
)
override
;
bool
set_name
(
const
LEX_CSTRING
*
name
);
inline
void
close_cursor
()
{
delete
cursor
;
cursor
=
0
;
}
inline
bool
is_in_use
()
{
return
flags
&
(
uint
)
IS_IN_USE
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment