mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
Fix for bug #13501 "build problem: too many arguments to function my_bool
acl_init". Updated calls to acl_init()/grant_init() in init_embedded_server() - their signatures were changed recently, now they don't need argument for passing pointer to THD object (this code was only compiled if one built embedded server library with --with-embedded-privilege-control switch). libmysqld/lib_sql.cc: acl_init/grant_init() are now used only at server start up so they always allocate temporary THD object and don't need argument for passing pointer to it.
This commit is contained in:
parent
ab7ec7ee8f
commit
06313b18f2
1 changed files with 2 additions and 2 deletions
|
@ -427,9 +427,9 @@ int init_embedded_server(int argc, char **argv, char **groups)
|
|||
|
||||
acl_error= 0;
|
||||
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
||||
if (!(acl_error= acl_init((THD *)0, opt_noacl)) &&
|
||||
if (!(acl_error= acl_init(opt_noacl)) &&
|
||||
!opt_noacl)
|
||||
(void) grant_init((THD *)0);
|
||||
(void) grant_init();
|
||||
#endif
|
||||
if (acl_error || my_tz_init((THD *)0, default_tz_name, opt_bootstrap))
|
||||
{
|
||||
|
|
Loading…
Add table
Reference in a new issue