revision-id: 2df2b86fe753cf7d07baacfff6d586fbc64d5e25 (mariadb-10.2.15-73-g2df2b86fe75) parent(s): 1530e7c4287f757706bd12745a7f3f50742ebf78 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-06-25 11:00:37 +0200 message: embedded server client is inherited from old library and do not suport new feature --- client/mysqltest.cc | 7 +++++++ mysql-test/t/mysqltest_tracking_info.test | 1 + mysql-test/t/reset_connection.test | 2 ++ 3 files changed, 10 insertions(+) diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 166090a841a..7eb7b8ec118 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -6520,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"); @@ -6531,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 } @@ -7797,6 +7802,7 @@ void append_info(DYNAMIC_STRING *ds, ulonglong affected_rows, 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; @@ -7847,6 +7853,7 @@ static void append_session_track_info(DYNAMIC_STRING *ds, MYSQL *mysql) } dynstr_append(ds, "\n\n"); } +#endif /* EMBEDDED_LIBRARY */ } diff --git a/mysql-test/t/mysqltest_tracking_info.test b/mysql-test/t/mysqltest_tracking_info.test index 9853e50d9d5..c32e20703a5 100644 --- a/mysql-test/t/mysqltest_tracking_info.test +++ b/mysql-test/t/mysqltest_tracking_info.test @@ -1,5 +1,6 @@ --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'; 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