Merge branch 'develop' into feature-MAX-60

This commit is contained in:
MassimilianoPinto
2014-05-29 12:12:05 +02:00
9 changed files with 169 additions and 8 deletions

View File

@ -118,6 +118,7 @@ extern void printServer(SERVER *);
extern void printAllServers();
extern void dprintAllServers(DCB *);
extern void dprintServer(DCB *, SERVER *);
extern void dListServers(DCB *);
extern char *server_status(SERVER *);
extern void server_set_status(SERVER *, int);
extern void server_clear_status(SERVER *, int);

View File

@ -160,4 +160,6 @@ bool service_set_slave_conn_limit (
char* valstr,
count_spec_t count_spec);
extern void dprintService(DCB *, SERVICE *);
extern void dListServices(DCB *);
extern void dListListeners(DCB *);
#endif

View File

@ -93,6 +93,7 @@ void printAllSessions();
void printSession(SESSION *);
void dprintAllSessions(struct dcb *);
void dprintSession(struct dcb *, SESSION *);
void dListSessions(struct dcb *);
char *session_state(int);
bool session_link_dcb(SESSION *, struct dcb *);
SESSION* get_session_by_router_ses(void* rses);