diff options
| author | unknown <mleich@five.local.lan> | 2008-04-04 14:50:46 +0200 |
|---|---|---|
| committer | unknown <mleich@five.local.lan> | 2008-04-04 14:50:46 +0200 |
| commit | 3d2c23d0340636c5ffbc2d24d3f1964822616fcb (patch) | |
| tree | 304e3851bf286ae3fb461633cc63c96851b0c960 /sql/init.cc | |
| parent | 21419b92291186c40a515f0387066fcff52f9ea1 (diff) | |
| parent | afa5c3e20c72108275baa624e47d79ac02cd3d2b (diff) | |
| download | mariadb-git-3d2c23d0340636c5ffbc2d24d3f1964822616fcb.tar.gz | |
Merge five.local.lan:/work/trees/mysql-5.1-build-src-clean
into five.local.lan:/work/merge/mysql-5.1-build
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 |