summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authordlenev@mysql.com <>2005-09-27 23:36:02 +0400
committerdlenev@mysql.com <>2005-09-27 23:36:02 +0400
commited1c0cbd07a1f8126711921ebe526cd0205cacd0 (patch)
treebaa5a807ef9a840cc80daf7de2c2cacfd86fbf22 /libmysqld
parenta5feed9813ac72d08852e15c8bb6b6b034364a69 (diff)
downloadmariadb-git-ed1c0cbd07a1f8126711921ebe526cd0205cacd0.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).
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/lib_sql.cc4
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))
{