diff options
| author | unknown <dlenev@mysql.com> | 2005-09-28 15:59:55 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-09-28 15:59:55 +0400 |
| commit | ffe0f788012dacbf18dafeabbb1970703b029b5b (patch) | |
| tree | 7256525190a6a7f03efc9ac428fb9b6f76a1a953 /libmysqld/lib_sql.cc | |
| parent | ce4a6e3112bcc4860bd5edb1313ed850bf5ef21a (diff) | |
| parent | dfb89919cfb1f9a786f7c35ae4bd81b913eabfad (diff) | |
| download | mariadb-git-ffe0f788012dacbf18dafeabbb1970703b029b5b.tar.gz | |
Merge mysql.com:/home/dlenev/src/mysql-4.1-bg13501
into mysql.com:/home/dlenev/src/mysql-5.0-merges
libmysqld/lib_sql.cc:
Auto merged
Diffstat (limited to 'libmysqld/lib_sql.cc')
| -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 99761ceb8c7..5e621bf4419 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -423,9 +423,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)) { |