diff options
| author | cmiller@zippy.cornsilk.net <> | 2008-04-03 13:14:57 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2008-04-03 13:14:57 -0400 |
| commit | 7e78633f81798068e599cbd467ceb094ef5e5224 (patch) | |
| tree | b76b47d30b33f51df8172b3d28204a2a0497c7d6 /sql/init.cc | |
| parent | eac3a26efab4f3886ba68ed24cc1ddfc453dfa0e (diff) | |
| parent | 9ff7a0cedca7b92b5c16f282e52e83460a6d7092 (diff) | |
| download | mariadb-git-7e78633f81798068e599cbd467ceb094ef5e5224.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my51-bug26294
Diffstat (limited to 'sql/init.cc')
| -rw-r--r-- | sql/init.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/init.cc b/sql/init.cc index aee0eb7179c..afda36b6b9d 100644 --- a/sql/init.cc +++ b/sql/init.cc @@ -35,7 +35,7 @@ void unireg_init(ulong options) wild_many='%'; wild_one='_'; wild_prefix='\\'; /* Change to sql syntax */ current_pid=(ulong) getpid(); /* Save for later ref */ - init_time(); /* Init time-functions (read zone) */ + my_init_time(); /* Init time-functions (read zone) */ #ifndef EMBEDDED_LIBRARY my_abort_hook=unireg_abort; /* Abort with close of databases */ #endif |