diff options
| author | monty@mashka.mysql.fi <> | 2003-01-09 22:43:23 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-01-09 22:43:23 +0200 |
| commit | c9dc5a206bd162b10a3a1a2bebc054cf3c5a6ed0 (patch) | |
| tree | 5ffbc6660efade54ba4bc490d83c1538515feb3e /sql/sql_show.cc | |
| parent | af76ac08fd64f57bb1939db1cc6b39b18eae969f (diff) | |
| parent | bf683af4cea9a9efc3e524d5aabde4886e93540f (diff) | |
| download | mariadb-git-c9dc5a206bd162b10a3a1a2bebc054cf3c5a6ed0.tar.gz | |
Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index b01555effa8..281fa92de6a 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1497,6 +1497,7 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables, case SHOW_RPL_STATUS: end= strmov(buff, rpl_status_type[(int)rpl_status]); break; +#ifndef EMBEDDED_LIBRARY case SHOW_SLAVE_RUNNING: { LOCK_ACTIVE_MI; @@ -1505,6 +1506,7 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables, UNLOCK_ACTIVE_MI; break; } +#endif case SHOW_OPENTABLES: end= int10_to_str((long) cached_tables(), buff, 10); break; |