database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

EXPLAIN FORMAT=JSON : Fix MDEV-7266, bug in pretty-printer

Browse Source 
- Single_line_formatting_helper should not accidentally exit the
  DISABLED state. No JSON construct should be able to move the
  Single_line_formatting_helper from DISABLED state.
This commit is contained in:
Sergei Petrunia
2014-12-06 20:13:38 +03:00
parent dc259324d7
commit eeef80d09f
4 changed files with 91 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/my_json_writer.cc
View File

@ -218,7 +218,8 @@ bool Single_line_formatting_helper::on_start_array()
}
else
{
state= INACTIVE;
if (state != DISABLED)
state= INACTIVE;
// TODO: what if we have accumulated some stuff already? shouldn't we
// flush it?
return false; // not handled
@ -313,6 +314,9 @@ void Single_line_formatting_helper::flush_on_one_line()
void Single_line_formatting_helper::disable_and_flush()
{
if (state == DISABLED)
return;
bool start_array= (state == IN_ARRAY);
state= DISABLED;
// deactivate ourselves and flush all accumulated calls.