mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-26 18:25:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-13754 Memory leak in mariabackup.incremental_backup

Browse source 
The test mariabackup.incremental_backup revealed a memory leak
in have_queries_to_wait_for(). The problem is that
xb_mysql_query() is being invoked with bool use_result=true
but the result is not being freed by mysql_store_result().
There are similar leaks in other functions.

have_queries_to_wait_for(): Invoke mysql_free_result() to
clean up after the mysql_store_result() that was invoked
by xb_mysql_query().

select_incremental_lsn_from_history(): Plug the leak on failure.

kill_long_queries(): Plug the memory leak.
(This function always leaked memory when it was called.)
This commit is contained in:
Marko Mäkelä 2017-08-18 10:07:11 +03:00
commit 605b835220
1 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

32
extra/mariabackup/backup_mysql.cc
View file

@ -575,7 +575,6 @@ bool
select_incremental_lsn_from_history(lsn_t *incremental_lsn)
{
MYSQL_RES *mysql_result;
MYSQL_ROW row;
char query[1000];
char buf[100];
@ -608,27 +607,27 @@ select_incremental_lsn_from_history(lsn_t *incremental_lsn)
mysql_result = xb_mysql_query(mysql_connection, query, true);
ut_ad(mysql_num_fields(mysql_result) == 1);
if (!(row = mysql_fetch_row(mysql_result))) {
const MYSQL_ROW row = mysql_fetch_row(mysql_result);
if (row) {
*incremental_lsn = strtoull(row[0], NULL, 10);
msg("Found and using lsn: " LSN_PF " for %s %s\n",
*incremental_lsn,
opt_incremental_history_uuid ? "uuid" : "name",
opt_incremental_history_uuid ?
opt_incremental_history_uuid :
opt_incremental_history_name);
} else {
msg("Error while attempting to find history record "
"for %s %s\n",
opt_incremental_history_uuid ? "uuid" : "name",
opt_incremental_history_uuid ?
opt_incremental_history_uuid :
opt_incremental_history_name);
return(false);
}
*incremental_lsn = strtoull(row[0], NULL, 10);
mysql_free_result(mysql_result);
msg("Found and using lsn: " LSN_PF " for %s %s\n", *incremental_lsn,
opt_incremental_history_uuid ? "uuid" : "name",
opt_incremental_history_uuid ?
opt_incremental_history_uuid :
opt_incremental_history_name);
return(true);
return(row != NULL);
}
static
@ -718,6 +717,7 @@ have_queries_to_wait_for(MYSQL *connection, uint threshold)
MYSQL_RES *result = xb_mysql_query(connection, "SHOW FULL PROCESSLIST",
true);
const bool all_queries = (opt_lock_wait_query_type == QUERY_TYPE_ALL);
bool have_to_wait = false;
while (MYSQL_ROW row = mysql_fetch_row(result)) {
const char *info = row[7];
@ -730,11 +730,13 @@ have_queries_to_wait_for(MYSQL *connection, uint threshold)
|| is_update_query(info))) {
msg_ts("Waiting for query %s (duration %d sec): %s",
id, duration, info);
return(true);
have_to_wait = true;
break;
}
}
return(false);
mysql_free_result(result);
return(have_to_wait);
}
static
@ -762,6 +764,8 @@ kill_long_queries(MYSQL *connection, time_t timeout)
xb_mysql_query(connection, kill_stmt, false, false);
}
}
mysql_free_result(result);
}
static