diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-12-19 11:35:44 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-12-19 11:35:44 +0100 |
| commit | a978bdda1e2de35c79e432f026869e163657a263 (patch) | |
| tree | 73e36b02fe3b8515c1f05bf4d43ecfa0bbf7c420 /client/mysqlbinlog.cc | |
| parent | 724dbaabc0d06c4446417eb217d8536f193461f9 (diff) | |
| parent | 0773c7f422c426e5693fc901df9999092e56aef3 (diff) | |
| download | mariadb-git-a978bdda1e2de35c79e432f026869e163657a263.tar.gz | |
mysql-5.5.41 merge
Diffstat (limited to 'client/mysqlbinlog.cc')
| -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 990fadadae2..57492577e91 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 @@ -2413,6 +2413,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); if (load_defaults("my", load_groups, &argc, &argv)) |