1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merge branch '10.6' into 10.9

This commit is contained in:
Oleksandr Byelkin
2023-08-04 08:01:06 +02:00
858 changed files with 12277 additions and 6177 deletions

View File

@@ -314,7 +314,13 @@ public:
const char *m_param_end;
private:
const char *m_body_begin;
/*
A pointer to the body start inside the cpp buffer.
Used only during parsing. Should be removed eventually.
The affected functions/methods should be fixed to get the cpp body start
as a parameter, rather than through this member.
*/
const char *m_cpp_body_begin;
public:
/*
@@ -351,12 +357,11 @@ public:
/** Set the body-definition start position. */
void
set_body_start(THD *thd, const char *begin_ptr);
set_body_start(THD *thd, const char *cpp_body_start);
/** Set the statement-definition (body-definition) end position. */
void
set_stmt_end(THD *thd);
set_stmt_end(THD *thd, const char *cpp_body_end);
bool
execute_trigger(THD *thd,