database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-6247: Merge 10.0-galera to 10.1.

Browse Source 
Merged lp:maria/maria-10.0-galera up to revision 3879.

Added a new functions to handler API to forcefully abort_transaction,
producing fake_trx_id, get_checkpoint and set_checkpoint for XA. These
were added for future possiblity to add more storage engines that
could use galera replication.
This commit is contained in:
Jan Lindström
2014-08-06 15:39:15 +03:00
parent e974b56438
commit df4dd593f2
327 changed files with 28127 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
sql/sql_show.cc
View File

@ -2931,11 +2931,39 @@ static bool show_status_array(THD *thd, const char *wild,
*prefix_end++= '_';
len=name_buffer + sizeof(name_buffer) - prefix_end;
#ifdef WITH_WSREP
bool is_wsrep_var= FALSE;
/*
This is a workaround for lp:1306875 (PBX) to skip switching of wsrep
status variable name's first letter to uppercase. This is an optimization
for status variables defined under wsrep plugin.
TODO: remove once lp:1306875 has been addressed.
*/
if (*prefix && !my_strcasecmp(system_charset_info, prefix, "wsrep"))
{
is_wsrep_var= TRUE;
}
#endif /* WITH_WSREP */
for (; variables->name; variables++)
{
bool wild_checked;
strnmov(prefix_end, variables->name, len);
name_buffer[sizeof(name_buffer)-1]=0; /* Safety */
#ifdef WITH_WSREP
/*
If the prefix is NULL, that means we are looking into the status variables
defined directly under mysqld.cc. Do not capitalize wsrep status variable
names until lp:1306875 has been fixed.
TODO: remove once lp:1306875 has been addressed.
*/
if (!(*prefix) && !strncasecmp(name_buffer, "wsrep", strlen("wsrep")))
{
is_wsrep_var= TRUE;
}
#endif /* WITH_WSREP */
if (ucase_names)
my_caseup_str(system_charset_info, name_buffer);
else
@ -2944,8 +2972,9 @@ static bool show_status_array(THD *thd, const char *wild,
DBUG_ASSERT(name_buffer[0] >= 'a');
DBUG_ASSERT(name_buffer[0] <= 'z');
/* traditionally status variables have a first letter uppercased */
if (status_var)
// WSREP_TODO: remove once lp:1306875 has been addressed.
if (IF_WSREP(is_wsrep_var == FALSE, 1) &&
status_var)
name_buffer[0]-= 'a' - 'A';
}