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

Merge branch '10.6' into 10.7

Browse Source
This commit is contained in:
Sergei Golubchik
2022-05-18 10:34:38 +02:00
parent 0a1d9d0681 b2187662bc
commit 99a433ed1c
96 changed files with 2793 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_lex.cc
View File

@@ -7800,7 +7800,7 @@ bool LEX::maybe_start_compound_statement(THD *thd)
if (!make_sp_head(thd, NULL, &sp_handler_procedure, DEFAULT_AGGREGATE))
return true;
sphead->set_suid(SP_IS_NOT_SUID);
sphead->set_body_start(thd, thd->m_parser_state->m_lip.get_cpp_ptr());
sphead->set_body_start(thd, thd->m_parser_state->m_lip.get_cpp_tok_start());
}
return false;
}