diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-18 10:00:56 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-18 10:18:26 +0300 |
| commit | 74ce0cf148e125ee2a4bb539c3df7bede13264a9 (patch) | |
| tree | 65cdc71283998e74aadf29fd68f7da7b1d4dfa3f /extra | |
| parent | e9e051d2972a77224f95563e5555cebd83615d61 (diff) | |
| download | mariadb-git-74ce0cf148e125ee2a4bb539c3df7bede13264a9.tar.gz | |
MDEV-13574 related Mariabackup code cleanup (non-functional change)
have_queries_to_wait_for(), kill_long_queries(): Declare and initialize
variables in one go.
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/backup_mysql.cc | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/extra/mariabackup/backup_mysql.cc b/extra/mariabackup/backup_mysql.cc index 35e838e83d3..02028b1d510 100644 --- a/extra/mariabackup/backup_mysql.cc +++ b/extra/mariabackup/backup_mysql.cc @@ -715,14 +715,11 @@ static bool have_queries_to_wait_for(MYSQL *connection, uint threshold) { - MYSQL_RES *result; - MYSQL_ROW row; - bool all_queries; - - result = xb_mysql_query(connection, "SHOW FULL PROCESSLIST", true); + MYSQL_RES *result = xb_mysql_query(connection, "SHOW FULL PROCESSLIST", + true); + const bool all_queries = (opt_lock_wait_query_type == QUERY_TYPE_ALL); - all_queries = (opt_lock_wait_query_type == QUERY_TYPE_ALL); - while ((row = mysql_fetch_row(result)) != NULL) { + while (MYSQL_ROW row = mysql_fetch_row(result)) { const char *info = row[7]; int duration = row[5] ? atoi(row[5]) : 0; char *id = row[0]; @@ -744,15 +741,12 @@ static void kill_long_queries(MYSQL *connection, time_t timeout) { - MYSQL_RES *result; - MYSQL_ROW row; - bool all_queries; char kill_stmt[100]; - result = xb_mysql_query(connection, "SHOW FULL PROCESSLIST", true); - - all_queries = (opt_kill_long_query_type == QUERY_TYPE_ALL); - while ((row = mysql_fetch_row(result)) != NULL) { + MYSQL_RES *result = xb_mysql_query(connection, "SHOW FULL PROCESSLIST", + true); + const bool all_queries = (opt_kill_long_query_type == QUERY_TYPE_ALL); + while (MYSQL_ROW row = mysql_fetch_row(result)) { const char *info = row[7]; long long duration = row[5]? atoll(row[5]) : 0; char *id = row[0]; |