mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.2' into 10.3

Browse source
This commit is contained in:
Oleksandr Byelkin 2019-06-14 07:36:47 +02:00
commit 4a3d51c76c
83 changed files with 2193 additions and 2608 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sql/my_json_writer.cc
View file

@ -129,6 +129,13 @@ void Json_writer::add_ll(longlong val)
add_unquoted_str(buf);
}
void Json_writer::add_ull(ulonglong val)
{
char buf[64];
my_snprintf(buf, sizeof(buf), "%llu", val);
add_unquoted_str(buf);
}
/* Add a memory size, printing in Kb, Kb, Gb if necessary */
void Json_writer::add_size(longlong val)