Commit 97bdd97c authored by bar@mysql.com's avatar bar@mysql.com

log.cc:

  rpl_charset failed on  Linux/AMD64.
parent 60404d2c
...@@ -1258,12 +1258,12 @@ bool MYSQL_LOG::write(Log_event* event_info) ...@@ -1258,12 +1258,12 @@ bool MYSQL_LOG::write(Log_event* event_info)
{ {
char buf[200]; char buf[200];
int written= my_snprintf(buf, sizeof(buf)-1, int written= my_snprintf(buf, sizeof(buf)-1,
"SET ONE_SHOT CHARACTER_SET_CLIENT=%lu,\ "SET ONE_SHOT CHARACTER_SET_CLIENT=%u,\
COLLATION_CONNECTION=%lu,COLLATION_DATABASE=%lu,COLLATION_SERVER=%lu", COLLATION_CONNECTION=%u,COLLATION_DATABASE=%u,COLLATION_SERVER=%u",
thd->variables.character_set_client->number, (uint) thd->variables.character_set_client->number,
thd->variables.collation_connection->number, (uint) thd->variables.collation_connection->number,
thd->variables.collation_database->number, (uint) thd->variables.collation_database->number,
thd->variables.collation_server->number); (uint) thd->variables.collation_server->number);
Query_log_event e(thd, buf, written, 0); Query_log_event e(thd, buf, written, 0);
e.set_log_pos(this); e.set_log_pos(this);
if (e.write(file)) if (e.write(file))
......
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