database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Ugly merge! But I am not done yet - there are a number of things I need to fix

Browse Source 
before I can push
This commit is contained in:
sasha@mysql.sashanet.com
2002-01-19 22:46:25 -07:00
parent d7ad2cbe5b 56129ce634
commit 684f13ef4c
39 changed files with 2998 additions and 1568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_show.cc
View File

@@ -1177,6 +1177,15 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables)
case SHOW_RPL_STATUS:
net_store_data(&packet2, rpl_status_type[(int)rpl_status]);
break;
case SHOW_SLAVE_RUNNING:
{
LOCK_ACTIVE_MI;
net_store_data(&packet2, (active_mi->slave_running &&
active_mi->rli.slave_running)
? "ON" : "OFF");
UNLOCK_ACTIVE_MI;
break;
}
case SHOW_OPENTABLES:
net_store_data(&packet2,(uint32) cached_tables());
break;