diff options
| author | monty@mysql.com <> | 2004-03-16 22:41:30 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-03-16 22:41:30 +0200 |
| commit | 350b4335696fc88efa2bbf2139d2f8bf9aa5701c (patch) | |
| tree | af285d8080c003d1ecb1479ec43c9b6996fd567f /sql/sql_show.cc | |
| parent | 861bf3c8c031ea80076acb7f7466bda73b23213c (diff) | |
| parent | 325f6615254c871d71d9d71bb5910a61d9a61ea2 (diff) | |
| download | mariadb-git-350b4335696fc88efa2bbf2139d2f8bf9aa5701c.tar.gz | |
merge with 4.0
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index ff4ff43519a..d68db2cb3bc 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1806,10 +1806,10 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables, break; case SHOW_SLAVE_RUNNING: { - LOCK_ACTIVE_MI; + pthread_mutex_lock(&LOCK_active_mi); end= strmov(buff, (active_mi->slave_running && active_mi->rli.slave_running) ? "ON" : "OFF"); - UNLOCK_ACTIVE_MI; + pthread_mutex_unlock(&LOCK_active_mi); break; } #endif /* HAVE_REPLICATION */ |