database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge 10.7 into 10.8

Browse Source
This commit is contained in:
Marko Mäkelä
2022-04-06 13:28:25 +03:00
parent 7b06bc9a94 2d8e38bc94
commit b2baeba415
95 changed files with 1044 additions and 1370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_lex.cc
View File

@@ -9285,18 +9285,18 @@ bool LEX::call_statement_start(THD *thd,
(static_cast<const LEX_CSTRING*>(db)))))
{
my_error(ER_WRONG_DB_NAME, MYF(0), db->str);
return NULL;
return true;
}
if (check_routine_name(pkg) ||
check_routine_name(proc))
return NULL;
return true;
// Concat `pkg` and `name` to `pkg.name`
LEX_CSTRING pkg_dot_proc;
if (q_pkg_proc.make_qname(thd->mem_root, &pkg_dot_proc) ||
check_ident_length(&pkg_dot_proc) ||
!(spname= new (thd->mem_root) sp_name(db, &pkg_dot_proc, true)))
return NULL;
return true;
sp_handler_package_function.add_used_routine(thd->lex, thd, spname);
sp_handler_package_body.add_used_routine(thd->lex, thd, &q_db_pkg);