test/cetus
1
0
Fork 0
mirror of https://gitee.com/wangbin579/cetus.git synced 2024-12-02 03:47:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix more show connectionlist problems

Browse Source
This commit is contained in:
lazio579 2019-03-20 10:41:32 +08:00
parent a803fa6296
commit 58a2bd8107
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -66,7 +66,7 @@ EXECUTE_PROCESS(COMMAND git describe --tags
MESSAGE(STATUS "building from ${GIT_REVISION}") MESSAGE(STATUS "building from ${GIT_REVISION}")
SET(CPACK_PACKAGE_VERSION_MAJOR "2") SET(CPACK_PACKAGE_VERSION_MAJOR "2")
SET(CPACK_PACKAGE_VERSION_MINOR "2") SET(CPACK_PACKAGE_VERSION_MINOR "2")
SET(CPACK_PACKAGE_VERSION_PATCH "0") SET(CPACK_PACKAGE_VERSION_PATCH "1")
SET(CPACK_PACKAGE_VENDOR "MySQL") SET(CPACK_PACKAGE_VENDOR "MySQL")
SET(PACKAGE_NAME cetus) SET(PACKAGE_NAME cetus)

4
plugins/admin/admin-commands.c
View File

@ -566,6 +566,7 @@ void admin_show_connectionlist(network_mysqld_con *con, int show_count)
} }
#ifndef SIMPLE_PARSER #ifndef SIMPLE_PARSER
if (con->servers) {
int j; int j;
GString *servers = g_string_new(NULL); GString *servers = g_string_new(NULL);
for (j = 0; j < con->servers->len; j++) { for (j = 0; j < con->servers->len; j++) {
@ -582,6 +583,9 @@ void admin_show_connectionlist(network_mysqld_con *con, int show_count)
} }
g_ptr_array_add(row, g_strdup(servers->str)); g_ptr_array_add(row, g_strdup(servers->str));
g_string_free(servers, TRUE); g_string_free(servers, TRUE);
} else {
g_ptr_array_add(row, NULL);
}
#else #else
if (con->server != NULL) { if (con->server != NULL) {