summaryrefslogtreecommitdiff
path: root/client/mysql.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2022-12-11 00:23:16 +0100
committerSergei Golubchik <serg@mariadb.org>2023-01-19 12:39:37 +0100
commitc37ebaf6c224e7ba571653eecd48a080d4c1a061 (patch)
treeb31713c7bdd46a099e3f0aac519af45b7187e475 /client/mysql.cc
parenteb26bf6e09f714bfeda8e411b411b4991edf1c4d (diff)
downloadmariadb-git-c37ebaf6c224e7ba571653eecd48a080d4c1a061.tar.gz
MDEV-30153 ad hoc client versions are confusing
try to make them less confusing for users. Hopefully, if the version string will be changed like - mariadb Ver 15.1 Distrib 10.11.2-MariaDB for Linux (x86_64) + mariadb from 10.11.2-MariaDB, client 15.1 for Linux (x86_64) users will be less inclined to reply "15.1" to the question "what mariadb version are you using?"
Diffstat (limited to 'client/mysql.cc')
-rw-r--r--client/mysql.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index 0ec8c734f24..06e662ad860 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1850,12 +1850,12 @@ static void usage(int version)
#else
const char* readline= "readline";
#endif
- printf("%s Ver %s Distrib %s for %s (%s) using %s %s\n",
- my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE,
+ printf("%s from %s, client %s for %s (%s) using %s %s\n",
+ my_progname, MYSQL_SERVER_VERSION, VER, SYSTEM_TYPE, MACHINE_TYPE,
readline, rl_library_version);
#else
- printf("%s Ver %s Distrib %s for %s (%s), source revision %s\n", my_progname, VER,
- MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE,SOURCE_REVISION);
+ printf("%s from %s, client %s for %s (%s), source revision %s\n", my_progname,
+ MYSQL_SERVER_VERSION, VER, SYSTEM_TYPE, MACHINE_TYPE,SOURCE_REVISION);
#endif
if (version)