1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
This commit is contained in:
jonas@perch.ndb.mysql.com 2005-09-28 14:42:01 +02:00
commit a11dcd74d2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libmysqld/lib_sql.cc
View File

@ -423,9 +423,9 @@ int init_embedded_server(int argc, char **argv, char **groups)
acl_error= 0; acl_error= 0;
#ifndef NO_EMBEDDED_ACCESS_CHECKS #ifndef NO_EMBEDDED_ACCESS_CHECKS
if (!(acl_error= acl_init((THD *)0, opt_noacl)) && if (!(acl_error= acl_init(opt_noacl)) &&
!opt_noacl) !opt_noacl)
(void) grant_init((THD *)0); (void) grant_init();
#endif #endif
if (acl_error || my_tz_init((THD *)0, default_tz_name, opt_bootstrap)) if (acl_error || my_tz_init((THD *)0, default_tz_name, opt_bootstrap))
{ {