summaryrefslogtreecommitdiff
path: root/client/mysql.cc
diff options
context:
space:
mode:
authorTatiana A. Nurnberg <azundris@mysql.com>2009-02-24 09:31:42 +0100
committerTatiana A. Nurnberg <azundris@mysql.com>2009-02-24 09:31:42 +0100
commit982f88fc31ed95a0c7d445631335b1fb8ebe2630 (patch)
tree455ad0a077be80be2ab54407de4faf81a11871c1 /client/mysql.cc
parent491db675bdd568b8dcac84f1f84d4013ede394d2 (diff)
parent1d0b5cc9dbc338df3a9698bfc25b591ee5becd60 (diff)
downloadmariadb-git-982f88fc31ed95a0c7d445631335b1fb8ebe2630.tar.gz
automerge
Diffstat (limited to 'client/mysql.cc')
-rw-r--r--client/mysql.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index 2ecfd637453..d1d36d79565 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -2832,7 +2832,7 @@ com_charset(String *buffer __attribute__((unused)), char *line)
param= get_arg(buff, 0);
if (!param || !*param)
{
- return put_info("Usage: \\C char_setname | charset charset_name",
+ return put_info("Usage: \\C charset_name | charset charset_name",
INFO_ERROR, 0);
}
new_cs= get_charset_by_csname(param, MY_CS_PRIMARY, MYF(MY_WME));