Commit 59922574 authored by unknown's avatar unknown
Browse files

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
parents ada963e0 06313b18

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))

  {