Commit ad2bd09d authored by petr@mysql.com's avatar petr@mysql.com

coding style fix

parent 3f180bca
...@@ -1478,19 +1478,19 @@ static bool show_status_array(THD *thd, const char *wild, ...@@ -1478,19 +1478,19 @@ static bool show_status_array(THD *thd, const char *wild,
end= int10_to_str((long) *(uint32*) value, buff, 10); end= int10_to_str((long) *(uint32*) value, buff, 10);
break; break;
case SHOW_HAVE: case SHOW_HAVE:
{ {
SHOW_COMP_OPTION tmp= *(SHOW_COMP_OPTION*) value; SHOW_COMP_OPTION tmp= *(SHOW_COMP_OPTION*) value;
pos= show_comp_option_name[(int) tmp]; pos= show_comp_option_name[(int) tmp];
end= strend(pos); end= strend(pos);
break; break;
} }
case SHOW_CHAR: case SHOW_CHAR:
{ {
if (!(pos= value)) if (!(pos= value))
pos= ""; pos= "";
end= strend(pos); end= strend(pos);
break; break;
} }
case SHOW_STARTTIME: case SHOW_STARTTIME:
nr= (long) (thd->query_start() - start_time); nr= (long) (thd->query_start() - start_time);
end= int10_to_str(nr, buff, 10); end= int10_to_str(nr, buff, 10);
...@@ -1503,29 +1503,29 @@ static bool show_status_array(THD *thd, const char *wild, ...@@ -1503,29 +1503,29 @@ static bool show_status_array(THD *thd, const char *wild,
end= strmov(buff, rpl_status_type[(int)rpl_status]); end= strmov(buff, rpl_status_type[(int)rpl_status]);
break; break;
case SHOW_SLAVE_RUNNING: case SHOW_SLAVE_RUNNING:
{ {
pthread_mutex_lock(&LOCK_active_mi); pthread_mutex_lock(&LOCK_active_mi);
end= strmov(buff, (active_mi->slave_running && end= strmov(buff, (active_mi->slave_running &&
active_mi->rli.slave_running) ? "ON" : "OFF"); active_mi->rli.slave_running) ? "ON" : "OFF");
pthread_mutex_unlock(&LOCK_active_mi); pthread_mutex_unlock(&LOCK_active_mi);
break; break;
} }
#endif /* HAVE_REPLICATION */ #endif /* HAVE_REPLICATION */
case SHOW_OPENTABLES: case SHOW_OPENTABLES:
end= int10_to_str((long) cached_tables(), buff, 10); end= int10_to_str((long) cached_tables(), buff, 10);
break; break;
case SHOW_CHAR_PTR: case SHOW_CHAR_PTR:
{ {
if (!(pos= *(char**) value)) if (!(pos= *(char**) value))
pos= ""; pos= "";
end= strend(pos); end= strend(pos);
break; break;
} }
case SHOW_DOUBLE: case SHOW_DOUBLE:
{ {
end= buff + sprintf(buff, "%f", *(double*) value); end= buff + sprintf(buff, "%f", *(double*) value);
break; break;
} }
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
/* First group - functions relying on CTX */ /* First group - functions relying on CTX */
case SHOW_SSL_CTX_SESS_ACCEPT: case SHOW_SSL_CTX_SESS_ACCEPT:
......
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