diff options
| author | Sergei Krivonos <sergeikrivonos@gmail.com> | 2021-11-30 18:11:14 -0700 |
|---|---|---|
| committer | Sergei Krivonos <sergeikrivonos@gmail.com> | 2021-12-20 10:09:46 +0200 |
| commit | f5fe27294d42c7b9eb7cfbed4b4f5401b6c2bbbb (patch) | |
| tree | fdabe4ed6f065ed57554b092dfaa782571a2bce5 /sql/my_json_writer.cc | |
| parent | c9fcea14e9e1f34a97451706eac51276c85bbea7 (diff) | |
| download | mariadb-git-bb-10.8-MDEV-27036.tar.gz | |
MDEV-27036: re-enable my_json_writer-t unit testbb-10.8-MDEV-27036
Diffstat (limited to 'sql/my_json_writer.cc')
| -rw-r--r-- | sql/my_json_writer.cc | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/sql/my_json_writer.cc b/sql/my_json_writer.cc index 54eb8423caf..2b4f5d07f83 100644 --- a/sql/my_json_writer.cc +++ b/sql/my_json_writer.cc @@ -13,9 +13,12 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ -#include "my_global.h" #include "my_json_writer.h" +#include "sql_class.h" +#include "my_global.h" +#include "log.h" + #if !defined(NDEBUG) || defined(JSON_WRITER_UNIT_TEST) bool Json_writer::named_item_expected() const @@ -325,6 +328,7 @@ Json_writer_temp_disable::Json_writer_temp_disable(THD *thd_arg) thd= thd_arg; thd->opt_trace.disable_tracing_if_required(); } + Json_writer_temp_disable::~Json_writer_temp_disable() { thd->opt_trace.enable_tracing_if_required(); @@ -494,3 +498,18 @@ void Single_line_formatting_helper::disable_and_flush() state= INACTIVE; } + +Json_writer_struct::Json_writer_struct(THD *thd) + : Json_writer_struct(thd->opt_trace.get_current_json()) +{ +} + +Json_writer_object::Json_writer_object(THD *thd, const char *str) + : Json_writer_object(thd->opt_trace.get_current_json(), str) +{ +} + +Json_writer_array::Json_writer_array(THD *thd, const char *str) + : Json_writer_array(thd->opt_trace.get_current_json(), str) +{ +} |