Commit c7853e47 authored by unknown's avatar unknown
Browse files

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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
parents 7c8d269b 59922574

libmysqld/lib_sql.cc

+2 −2
Original line number Diff line number Diff line
@@ -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))

  {