database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fix memory problem: Both the allocation and pointer arithmetics on the

Browse Source 
head_sptr array was wrong.
This commit is contained in:
knielsen@mysql.com
2006-01-03 11:09:18 +01:00
parent 23e84337db
commit 06a49eca23
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/mysqlslap.c
View File

@@ -281,7 +281,7 @@ int main(int argc, char **argv)
stats *head_sptr; stats *head_sptr;
stats *sptr; stats *sptr;
head_sptr= (stats *)my_malloc(sizeof(stats) * *current, MYF(MY_ZEROFILL)); head_sptr= (stats *)my_malloc(sizeof(stats) * iterations, MYF(MY_ZEROFILL));
bzero(&conclusion, sizeof(conclusions)); bzero(&conclusion, sizeof(conclusions));
@@ -290,7 +290,7 @@ int main(int argc, char **argv)
else else
client_limit= actual_queries; client_limit= actual_queries;
for (x= 0, sptr= head_sptr; x < iterations; x++, sptr+= sizeof(stats)) for (x= 0, sptr= head_sptr; x < iterations; x++, sptr++)
{ {
/* /*
We might not want to load any data, such as when we are calling We might not want to load any data, such as when we are calling
@@ -1192,7 +1192,7 @@ generate_stats(conclusions *con, statement *eng, stats *sptr)
con->avg_rows= sptr->rows; con->avg_rows= sptr->rows;
/* With no next, we know it is the last element that was malloced */ /* With no next, we know it is the last element that was malloced */
for (ptr= sptr, x= 0; x < iterations; ptr+= sizeof(stats), x++) for (ptr= sptr, x= 0; x < iterations; ptr++, x++)
{ {
con->avg_timing+= ptr->timing; con->avg_timing+= ptr->timing;