diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-01-26 22:54:27 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-01-26 22:54:27 -0500 |
| commit | 7cda4bee0ef7c8a3ec85e94bc1443ceaba3a64e8 (patch) | |
| tree | f8c1f556f36f026038015e7215ae88b0cb7b1ce5 /client | |
| parent | ea229eb6bb29ee7b11a7d28a7d4c80a593cb1d3b (diff) | |
| parent | fb71449b10100e9a0f887b1585000fbfab294f3c (diff) | |
| download | mariadb-git-7cda4bee0ef7c8a3ec85e94bc1443ceaba3a64e8.tar.gz | |
maria-10.0.16 merge
bzr merge -r4588 maria/10.0
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqlbinlog.cc | 5 | ||||
| -rw-r--r-- | client/mysqltest.cc | 2 |
2 files changed, 4 insertions, 3 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)) diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 02a075cf9b4..9b7a6e8fd19 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -5908,7 +5908,7 @@ void do_connect(struct st_command *command) { int con_port= opt_port; char *con_options; - char *ssl_cipher= 0; + char *ssl_cipher __attribute__((unused))= 0; my_bool con_ssl= 0, con_compress= 0; my_bool con_pipe= 0; my_bool con_shm __attribute__ ((unused))= 0; |