summaryrefslogtreecommitdiff
path: root/sql/my_json_writer.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/my_json_writer.cc')
-rw-r--r--sql/my_json_writer.cc21
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)
+{
+}