database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge branch '10.4' into bb-10.4-mdev17096

Browse Source
This commit is contained in:
Igor Babaev
2019-02-12 23:19:43 -08:00
parent 27c3abde30 be8709eb7b
commit 953ca199fb
175 changed files with 10549 additions and 2961 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_explain.cc
View File

@ -236,7 +236,7 @@ void Explain_query::print_explain_json(select_result_sink *output,
CHARSET_INFO *cs= system_charset_info;
List<Item> item_list;
String *buf= &writer.output;
const String *buf= writer.output.get_string();
item_list.push_back(new (thd->mem_root)
Item_string(thd, buf->ptr(), buf->length(), cs),
thd->mem_root);