diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-10-23 15:59:24 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-10-23 15:59:24 +0200 |
| commit | f9e5195b40b4b6678b71fdac2b99442664037d36 (patch) | |
| tree | 8da99e7722c1f587c93a65fdc2a465992ec68b82 /client | |
| parent | 55fc3fb08830cfe8e55b45f5f0e1acf55d00cb4b (diff) | |
| parent | bac287c315b1792e7ae33f91add6a60292f9bae8 (diff) | |
| download | mariadb-git-f9e5195b40b4b6678b71fdac2b99442664037d36.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'client')
| -rw-r--r-- | client/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | client/mysql.cc | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index e3edacc351c..6ef14ff7283 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -1,4 +1,5 @@ # Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2008, 2018, MariaDB Corporation # # 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 diff --git a/client/mysql.cc b/client/mysql.cc index bc306c55880..624e97236aa 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1,6 +1,6 @@ /* - Copyright (c) 2000, 2014, Oracle and/or its affiliates. - Copyright (c) 2009, 2017, MariaDB + Copyright (c) 2000, 2018, Oracle and/or its affiliates. + Copyright (c) 2009, 2018, MariaDB Corporation 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 @@ -1459,7 +1459,7 @@ static struct my_option my_long_options[] = {"batch", 'B', "Don't use history file. Disable interactive behavior. (Enables --silent.)", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, - {"binary-as-hex", 'b', "Print binary data as hex", &opt_binhex, &opt_binhex, + {"binary-as-hex", 0, "Print binary data as hex", &opt_binhex, &opt_binhex, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"character-sets-dir", OPT_CHARSETS_DIR, "Directory for character set files.", &charsets_dir, |