diff options
| author | unknown <dlenev@mysql.com> | 2005-09-27 23:36:02 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-09-27 23:36:02 +0400 |
| commit | 06313b18f21166f17d89e8c88ab6329fa2368fb0 (patch) | |
| tree | baa5a807ef9a840cc80daf7de2c2cacfd86fbf22 /libmysqld | |
| parent | ab7ec7ee8f4ac8c751c6f0d84d8314154146bf10 (diff) | |
| download | mariadb-git-06313b18f21166f17d89e8c88ab6329fa2368fb0.tar.gz | |
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.
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 82e1c19d758..bf8c17a71af 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -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)) { |