database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

bzr merge -rtag:mariadb-10.0.12 maria/10.0

Browse Source
This commit is contained in:
Nirbhay Choubey
2014-06-19 13:12:38 -04:00
parent 0f5522c44f 0c64cd83eb
commit a76a6601ec
379 changed files with 15201 additions and 8280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_parse.cc
View File

@ -4880,6 +4880,10 @@ end_with_restore_list:
goto create_sp_error;
}
if (check_access(thd, CREATE_PROC_ACL, lex->sphead->m_db.str,
NULL, NULL, 0, 0))
goto create_sp_error;
/*
Check that a database directory with this name
exists. Design note: This won't work on virtual databases
@ -4891,10 +4895,6 @@ end_with_restore_list:
goto create_sp_error;
}
if (check_access(thd, CREATE_PROC_ACL, lex->sphead->m_db.str,
NULL, NULL, 0, 0))
goto create_sp_error;
name= lex->sphead->name(&namelen);
#ifdef HAVE_DLOPEN
if (lex->sphead->m_type == TYPE_ENUM_FUNCTION)