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.h | |
| 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.h')
| -rw-r--r-- | sql/my_json_writer.h | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/sql/my_json_writer.h b/sql/my_json_writer.h index 9e7081c96d1..8b796150ae1 100644 --- a/sql/my_json_writer.h +++ b/sql/my_json_writer.h @@ -17,7 +17,7 @@ #define JSON_WRITER_INCLUDED #include "my_base.h" -#include "sql_string.h" +#include "sql_class.h" #if !defined(NDEBUG) || defined(JSON_WRITER_UNIT_TEST) || defined ENABLED_JSON_WRITER_CONSISTENCY_CHECKS #include <set> @@ -389,10 +389,7 @@ protected: named_items_expectation.push_back(expect_named_children); #endif } - explicit Json_writer_struct(THD *thd) - : Json_writer_struct(thd->opt_trace.get_current_json()) - { - } + explicit Json_writer_struct(THD *thd); public: @@ -448,10 +445,7 @@ public: } } - explicit Json_writer_object(THD* thd, const char *str= nullptr) - : Json_writer_object(thd->opt_trace.get_current_json(), str) - { - } + explicit Json_writer_object(THD* thd, const char *str= nullptr); ~Json_writer_object() { @@ -621,10 +615,7 @@ public: } } - explicit Json_writer_array(THD *thd, const char *str= nullptr) - : Json_writer_array(thd->opt_trace.get_current_json(), str) - { - } + explicit Json_writer_array(THD *thd, const char *str= nullptr); ~Json_writer_array() { |