Commit e8f888a5 authored by unknown's avatar unknown

mysql.cc:

  bug#7571:
  Server & Client characterset are shown under different decriptions
  Switch them into the correct order.


client/mysql.cc:
  bug#7571:
  Server & Client characterset are shown under different decriptions
  Switch them into the correct order.
parent d5e89804
...@@ -2914,9 +2914,9 @@ com_status(String *buffer __attribute__((unused)), ...@@ -2914,9 +2914,9 @@ com_status(String *buffer __attribute__((unused)),
MYSQL_ROW cur=mysql_fetch_row(result); MYSQL_ROW cur=mysql_fetch_row(result);
if (cur) if (cur)
{ {
tee_fprintf(stdout, "Server characterset:\t%s\n", cur[0] ? cur[0] : ""); tee_fprintf(stdout, "Server characterset:\t%s\n", cur[0] ? cur[2] : "");
tee_fprintf(stdout, "Db characterset:\t%s\n", cur[3] ? cur[3] : ""); tee_fprintf(stdout, "Db characterset:\t%s\n", cur[3] ? cur[3] : "");
tee_fprintf(stdout, "Client characterset:\t%s\n", cur[2] ? cur[2] : ""); tee_fprintf(stdout, "Client characterset:\t%s\n", cur[2] ? cur[0] : "");
tee_fprintf(stdout, "Conn. characterset:\t%s\n", cur[1] ? cur[1] : ""); tee_fprintf(stdout, "Conn. characterset:\t%s\n", cur[1] ? cur[1] : "");
} }
mysql_free_result(result); mysql_free_result(result);
......
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