diff options
| -rw-r--r-- | client/mysqltest.cc | 90 | ||||
| -rw-r--r-- | mysql-test/r/mysqltest_tracking_info.result | 47 | ||||
| -rw-r--r-- | mysql-test/t/mysqltest_tracking_info.test | 25 | ||||
| -rw-r--r-- | mysql-test/t/reset_connection.test | 2 |
4 files changed, 163 insertions, 1 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index ebfa9ec0bb8..513ef39d2a5 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -125,7 +125,8 @@ static my_bool view_protocol= 0, view_protocol_enabled= 0; static my_bool cursor_protocol= 0, cursor_protocol_enabled= 0; static my_bool parsing_disabled= 0; static my_bool display_result_vertically= FALSE, display_result_lower= FALSE, - display_metadata= FALSE, display_result_sorted= FALSE; + display_metadata= FALSE, display_result_sorted= FALSE, + display_session_track_info= FALSE; static my_bool disable_query_log= 0, disable_result_log= 0; static my_bool disable_connect_log= 0; static my_bool disable_warnings= 0, disable_column_names= 0; @@ -153,6 +154,7 @@ static struct property prop_list[] = { { &abort_on_error, 0, 1, 0, "$ENABLED_ABORT_ON_ERROR" }, { &disable_connect_log, 0, 1, 1, "$ENABLED_CONNECT_LOG" }, { &disable_info, 0, 1, 1, "$ENABLED_INFO" }, + { &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" }, { &disable_query_log, 0, 0, 1, "$ENABLED_QUERY_LOG" }, @@ -166,6 +168,7 @@ enum enum_prop { P_ABORT= 0, P_CONNECT, P_INFO, + P_SESSION_TRACK, P_META, P_PS, P_QUERY, @@ -362,6 +365,7 @@ enum enum_commands { Q_WAIT_FOR_SLAVE_TO_STOP, Q_ENABLE_WARNINGS, Q_DISABLE_WARNINGS, Q_ENABLE_INFO, Q_DISABLE_INFO, + Q_ENABLE_SESSION_TRACK_INFO, Q_DISABLE_SESSION_TRACK_INFO, Q_ENABLE_METADATA, Q_DISABLE_METADATA, Q_ENABLE_COLUMN_NAMES, Q_DISABLE_COLUMN_NAMES, Q_EXEC, Q_DELIMITER, @@ -436,6 +440,8 @@ const char *command_names[]= "disable_warnings", "enable_info", "disable_info", + "enable_session_track_info", + "disable_session_track_info", "enable_metadata", "disable_metadata", "enable_column_names", @@ -6514,6 +6520,7 @@ void do_delimiter(struct st_command* command) static void do_reset_connection() { +#ifndef EMBEDDED_LIBRARY MYSQL *mysql = cur_con->mysql; DBUG_ENTER("do_reset_connection"); @@ -6525,6 +6532,10 @@ static void do_reset_connection() cur_con->stmt= NULL; } DBUG_VOID_RETURN; +#else + die("reset connection failed: unsupported by embedded server client library"); + return; +#endif } @@ -7782,6 +7793,70 @@ void append_info(DYNAMIC_STRING *ds, ulonglong affected_rows, } +/** + @brief Append state change information (received through Ok packet) to the output. + + @param [in,out] ds Dynamic string to hold the content to be printed. + @param [in] mysql Connection handle. +*/ + +static void append_session_track_info(DYNAMIC_STRING *ds, MYSQL *mysql) +{ +#ifndef EMBEDDED_LIBRARY + for (unsigned int type= SESSION_TRACK_BEGIN; type <= SESSION_TRACK_END; type++) + { + const char *data; + size_t data_length; + + if (!mysql_session_track_get_first(mysql, + (enum_session_state_type) type, + &data, &data_length)) + { + dynstr_append(ds, "-- "); + switch (type) + { + case SESSION_TRACK_SYSTEM_VARIABLES: + dynstr_append(ds, "Tracker : SESSION_TRACK_SYSTEM_VARIABLES\n"); + break; + case SESSION_TRACK_SCHEMA: + dynstr_append(ds, "Tracker : SESSION_TRACK_SCHEMA\n"); + break; + case SESSION_TRACK_STATE_CHANGE: + dynstr_append(ds, "Tracker : SESSION_TRACK_STATE_CHANGE\n"); + break; + case SESSION_TRACK_GTIDS: + dynstr_append(ds, "Tracker : SESSION_TRACK_GTIDS\n"); + break; + case SESSION_TRACK_TRANSACTION_CHARACTERISTICS: + dynstr_append(ds, "Tracker : SESSION_TRACK_TRANSACTION_CHARACTERISTICS\n"); + break; + case SESSION_TRACK_TRANSACTION_TYPE: + dynstr_append(ds, "Tracker : SESSION_TRACK_TRANSACTION_TYPE\n"); + break; + default: + DBUG_ASSERT(0); + dynstr_append(ds, "\n"); + } + + + dynstr_append(ds, "-- "); + dynstr_append_mem(ds, data, data_length); + } + else + continue; + while (!mysql_session_track_get_next(mysql, + (enum_session_state_type) type, + &data, &data_length)) + { + dynstr_append(ds, "\n-- "); + dynstr_append_mem(ds, data, data_length); + } + dynstr_append(ds, "\n\n"); + } +#endif /* EMBEDDED_LIBRARY */ +} + + /* Display the table headings with the names tab separated */ @@ -7962,6 +8037,9 @@ void run_query_normal(struct st_connection *cn, struct st_command *command, if (!disable_info) append_info(ds, mysql_affected_rows(mysql), mysql_info(mysql)); + if (display_session_track_info) + append_session_track_info(ds, mysql); + /* Add all warnings to the result. We can't do this if we are in the middle of processing results from multi-statement, because @@ -8377,6 +8455,10 @@ void run_query_stmt(struct st_connection *cn, struct st_command *command, if (!disable_info) append_info(ds, mysql_stmt_affected_rows(stmt), mysql_info(mysql)); + if (display_session_track_info) + append_session_track_info(ds, mysql); + + if (!disable_warnings) { /* Get the warnings from execute */ @@ -9358,6 +9440,12 @@ int main(int argc, char **argv) case Q_DISABLE_INFO: set_property(command, P_INFO, 1); break; + case Q_ENABLE_SESSION_TRACK_INFO: + set_property(command, P_SESSION_TRACK, 1); + break; + case Q_DISABLE_SESSION_TRACK_INFO: + set_property(command, P_SESSION_TRACK, 0); + break; case Q_ENABLE_METADATA: set_property(command, P_META, 1); break; diff --git a/mysql-test/r/mysqltest_tracking_info.result b/mysql-test/r/mysqltest_tracking_info.result new file mode 100644 index 00000000000..b5885a37cde --- /dev/null +++ b/mysql-test/r/mysqltest_tracking_info.result @@ -0,0 +1,47 @@ +SELECT @@session.character_set_client, @@session.character_set_results, @@session.character_set_connection; +@@session.character_set_client @@session.character_set_results @@session.character_set_connection +latin1 latin1 latin1 +SET @@session.session_track_system_variables='character_set_client,character_set_results,character_set_connection'; +# tracking info on +SET NAMES 'utf8'; +-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES +-- character_set_client +-- utf8 +-- character_set_connection +-- utf8 +-- character_set_results +-- utf8 + +SET NAMES 'big5'; +-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES +-- character_set_client +-- big5 +-- character_set_connection +-- big5 +-- character_set_results +-- big5 + +# tracking info on once +SET NAMES 'utf8'; +-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES +-- character_set_client +-- utf8 +-- character_set_connection +-- utf8 +-- character_set_results +-- utf8 + +SET NAMES 'big5'; +# tracking info on +SET NAMES 'utf8'; +-- Tracker : SESSION_TRACK_SYSTEM_VARIABLES +-- character_set_client +-- utf8 +-- character_set_connection +-- utf8 +-- character_set_results +-- utf8 + +# tracking info off once +SET NAMES 'big5'; +SET @@session.session_track_system_variables= default; diff --git a/mysql-test/t/mysqltest_tracking_info.test b/mysql-test/t/mysqltest_tracking_info.test new file mode 100644 index 00000000000..c32e20703a5 --- /dev/null +++ b/mysql-test/t/mysqltest_tracking_info.test @@ -0,0 +1,25 @@ + +--source include/no_protocol.inc +--source include/not_embedded.inc + +SELECT @@session.character_set_client, @@session.character_set_results, @@session.character_set_connection; +SET @@session.session_track_system_variables='character_set_client,character_set_results,character_set_connection'; + +--echo # tracking info on +--enable_session_track_info +SET NAMES 'utf8'; +SET NAMES 'big5'; +--disable_session_track_info +--echo # tracking info on once +--enable_session_track_info ONCE +SET NAMES 'utf8'; +SET NAMES 'big5'; +--echo # tracking info on +--enable_session_track_info +SET NAMES 'utf8'; +--echo # tracking info off once +--disable_session_track_info ONCE +SET NAMES 'big5'; +--disable_session_track_info + +SET @@session.session_track_system_variables= default; diff --git a/mysql-test/t/reset_connection.test b/mysql-test/t/reset_connection.test index 39465677483..49f41c32fc3 100644 --- a/mysql-test/t/reset_connection.test +++ b/mysql-test/t/reset_connection.test @@ -1,3 +1,5 @@ +--source include/not_embedded.inc + FLUSH STATUS; --disable_result_log |