diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2015-01-21 12:03:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2015-01-21 12:03:02 +0100 |
| commit | d9c01e4b4ac6a7e2bdbcaf71819fa3d4f5269840 (patch) | |
| tree | 4f86f6ce4e298430e313ed70f2225b3f29485f51 /client | |
| parent | d854a254b84595b3a8f3a4d8083a2b997d59912e (diff) | |
| parent | 8bc712e481a18976853fa57a7be77aab6159d431 (diff) | |
| download | mariadb-git-d9c01e4b4ac6a7e2bdbcaf71819fa3d4f5269840.tar.gz | |
5.5 merge
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqlbinlog.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 319be9111aa..7c93e8d3ebd 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -1,6 +1,6 @@ /* - Copyright (c) 2000, 2013, Oracle and/or its affiliates. - Copyright (c) 2009, 2013, Monty Program Ab. + Copyright (c) 2000, 2014, Oracle and/or its affiliates. + Copyright (c) 2009, 2014, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -2435,6 +2435,7 @@ int main(int argc, char** argv) DBUG_PROCESS(argv[0]); my_init_time(); // for time functions + tzset(); // set tzname init_alloc_root(&s_mem_root, 16384, 0, MYF(0)); if (load_defaults("my", load_groups, &argc, &argv)) |