diff options
| author | bar@mysql.com <> | 2005-09-05 20:05:32 +0500 |
|---|---|---|
| committer | bar@mysql.com <> | 2005-09-05 20:05:32 +0500 |
| commit | 6a5f00702d32b321ce80c78938b67a267e1991af (patch) | |
| tree | 8ddf834af64adb91c62bb931c1f9d08d5ea1f982 /sql/mysqld.cc | |
| parent | 0eafb9572ae29e85f10eacc5a89c508b9d3ffca2 (diff) | |
| parent | 32a3dd850bb9be36be2845377ebcf2991847bd56 (diff) | |
| download | mariadb-git-6a5f00702d32b321ce80c78938b67a267e1991af.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1.b9948
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 2d232986997..09c2eb1a769 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3081,7 +3081,7 @@ we force server id to 2, but this MySQL server will not act as a slave."); */ error_handler_hook = my_message_sql; start_signal_handler(); // Creates pidfile - if (acl_init((THD *)0, opt_noacl) || + if (acl_init(opt_noacl) || my_tz_init((THD *)0, default_tz_name, opt_bootstrap)) { abort_loop=1; @@ -3098,7 +3098,7 @@ we force server id to 2, but this MySQL server will not act as a slave."); exit(1); } if (!opt_noacl) - (void) grant_init((THD *)0); + (void) grant_init(); #ifdef HAVE_DLOPEN if (!opt_noacl) |