diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-02-17 14:37:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-02-17 14:37:17 +0200 |
| commit | f04b459fb75b28dd57c7f22bc69588f087956373 (patch) | |
| tree | 62f1dd7658c744e961f54d7e8ddfc12869e384b0 /client/mysqltest.cc | |
| parent | 8bc5bf2cb6a235e55a8fd9aaaff5d2b18296d37b (diff) | |
| parent | cac995ec6f7d23c5b725e6ee19fc4f6ed38561f1 (diff) | |
| download | mariadb-git-f04b459fb75b28dd57c7f22bc69588f087956373.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'client/mysqltest.cc')
| -rw-r--r-- | client/mysqltest.cc | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 77fffb8cfb3..9ad73f3e09e 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -156,6 +156,7 @@ static struct property prop_list[] = { { &display_session_track_info, 0, 1, 1, "$ENABLED_STATE_CHANGE_INFO" }, { &display_metadata, 0, 0, 0, "$ENABLED_METADATA" }, { &ps_protocol_enabled, 0, 0, 0, "$ENABLED_PS_PROTOCOL" }, + { &view_protocol_enabled, 0, 0, 0, "$ENABLED_VIEW_PROTOCOL"}, { &disable_query_log, 0, 0, 1, "$ENABLED_QUERY_LOG" }, { &disable_result_log, 0, 0, 1, "$ENABLED_RESULT_LOG" }, { &disable_warnings, 0, 0, 1, "$ENABLED_WARNINGS" } @@ -170,6 +171,7 @@ enum enum_prop { P_SESSION_TRACK, P_META, P_PS, + P_VIEW, P_QUERY, P_RESULT, P_WARN, @@ -375,6 +377,7 @@ enum enum_commands { Q_LOWERCASE, Q_START_TIMER, Q_END_TIMER, Q_CHARACTER_SET, Q_DISABLE_PS_PROTOCOL, Q_ENABLE_PS_PROTOCOL, + Q_DISABLE_VIEW_PROTOCOL, Q_ENABLE_VIEW_PROTOCOL, Q_ENABLE_NON_BLOCKING_API, Q_DISABLE_NON_BLOCKING_API, Q_DISABLE_RECONNECT, Q_ENABLE_RECONNECT, Q_IF, @@ -462,6 +465,8 @@ const char *command_names[]= "character_set", "disable_ps_protocol", "enable_ps_protocol", + "disable_view_protocol", + "enable_view_protocol", "enable_non_blocking_api", "disable_non_blocking_api", "disable_reconnect", @@ -1387,6 +1392,16 @@ void close_connections() DBUG_VOID_RETURN; } +void close_util_connections() +{ + DBUG_ENTER("close_util_connections"); + if (cur_con->util_mysql) + { + mysql_close(cur_con->util_mysql); + cur_con->util_mysql = 0; + } + DBUG_VOID_RETURN; +} void close_statements() { @@ -9720,6 +9735,14 @@ int main(int argc, char **argv) case Q_ENABLE_PS_PROTOCOL: set_property(command, P_PS, ps_protocol); break; + case Q_DISABLE_VIEW_PROTOCOL: + set_property(command, P_VIEW, 0); + /* Close only util connections */ + close_util_connections(); + break; + case Q_ENABLE_VIEW_PROTOCOL: + set_property(command, P_VIEW, view_protocol); + break; case Q_DISABLE_NON_BLOCKING_API: non_blocking_api_enabled= 0; break; |