Commit 87fcb23d authored by Tatiana A. Nurnberg's avatar Tatiana A. Nurnberg

automerge

parents 565660ed 982f88fc
...@@ -2855,7 +2855,7 @@ com_charset(String *buffer __attribute__((unused)), char *line) ...@@ -2855,7 +2855,7 @@ com_charset(String *buffer __attribute__((unused)), char *line)
param= get_arg(buff, 0); param= get_arg(buff, 0);
if (!param || !*param) 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); INFO_ERROR, 0);
} }
new_cs= get_charset_by_csname(param, MY_CS_PRIMARY, MYF(MY_WME)); new_cs= get_charset_by_csname(param, MY_CS_PRIMARY, MYF(MY_WME));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment