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

MDEV-11711: ArmHF EXPLAIN JSON garbage longlong values printed

Browse source 
Make sure printing with snprintf uses the correct typed parameters.
This commit is contained in:
Vicențiu Ciorbaru 2017-01-16 12:50:12 +02:00
commit 6560e9c3a8
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sql/my_json_writer.cc
View file

@ -125,7 +125,7 @@ void Json_writer::start_element()
void Json_writer::add_ll(longlong val)
{
char buf[64];
my_snprintf(buf, sizeof(buf), "%ld", val);
my_snprintf(buf, sizeof(buf), "%lld", val);
add_unquoted_str(buf);
}
@ -135,16 +135,16 @@ void Json_writer::add_size(longlong val)
{
char buf[64];
if (val < 1024)
my_snprintf(buf, sizeof(buf), "%ld", val);
my_snprintf(buf, sizeof(buf), "%lld", val);
else if (val < 1024*1024*16)
{
/* Values less than 16MB are specified in KB for precision */
size_t len= my_snprintf(buf, sizeof(buf), "%ld", val/1024);
size_t len= my_snprintf(buf, sizeof(buf), "%lld", val/1024);
strcpy(buf + len, "Kb");
}
else
{
size_t len= my_snprintf(buf, sizeof(buf), "%ld", val/(1024*1024));
size_t len= my_snprintf(buf, sizeof(buf), "%lld", val/(1024*1024));
strcpy(buf + len, "Mb");
}
add_str(buf);