1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

MDEV-12070 - Introduce thd_query_safe() from MySQL 5.7

Merged relevant part of MySQL revision:
565d20b44f
This commit is contained in:
Sergey Vojtovich
2017-06-22 17:15:10 +04:00
parent dd710e7552
commit 6d0aed42c5
4 changed files with 34 additions and 27 deletions

View File

@ -153,7 +153,7 @@ extern MYSQL_PLUGIN_IMPORT const char **errmesg;
extern bool volatile shutdown_in_progress;
extern "C" LEX_STRING * thd_query_string (MYSQL_THD thd);
extern "C" char **thd_query(MYSQL_THD thd);
extern "C" size_t thd_query_safe(MYSQL_THD thd, char *buf, size_t buflen);
/**
@class CSET_STRING
@ -183,7 +183,6 @@ public:
CHARSET_INFO *charset() const { return cs; }
friend LEX_STRING * thd_query_string (MYSQL_THD thd);
friend char **thd_query(MYSQL_THD thd);
};