1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

* Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.

* Fixed Debian/Ubuntu dist files.
* Fixed some compiler warnings.
This commit is contained in:
Nirbhay Choubey
2014-01-30 12:45:38 -05:00
parent 5b6a4f25a5
commit 4a6be51f78
47 changed files with 439 additions and 187 deletions

View File

@@ -1081,8 +1081,19 @@ bool do_command(THD *thd)
while (thd->wsrep_conflict_state== RETRY_AUTOCOMMIT)
{
WSREP_DEBUG("Retry autocommit for: %s\n", thd->wsrep_retry_query);
CHARSET_INFO *current_charset = thd->variables.character_set_client;
if (!is_supported_parser_charset(current_charset))
{
/* Do not use non-supported parser character sets */
WSREP_WARN("Current client character set is non-supported parser "
"character set: %s", current_charset->csname);
thd->variables.character_set_client = &my_charset_latin1;
WSREP_WARN("For retry temporally setting character set to : %s",
my_charset_latin1.csname);
}
return_value= dispatch_command(command, thd, thd->wsrep_retry_query,
thd->wsrep_retry_query_len);
thd->wsrep_retry_query_len);
thd->variables.character_set_client = current_charset;
}
}
if (thd->wsrep_retry_query && thd->wsrep_conflict_state != REPLAYING)