diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2019-05-07 16:13:53 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2019-05-07 16:13:53 +0400 |
| commit | 651a43e0a0361098c35164a128ca588a2989d8e1 (patch) | |
| tree | 5f1566d4a67c997c84becc7e3378f3f41fe487fc /client/mysqldump.c | |
| parent | 26cb9f75eeca7d4f3c9a345746f20456ff4b5ad8 (diff) | |
| download | mariadb-git-651a43e0a0361098c35164a128ca588a2989d8e1.tar.gz | |
MDEV-18782 mysqldump --all-databases causes segmentation fault.
Do not consider rows of Information_schema.files where
LOGFILE_GROUP_NAME is NULL.
Diffstat (limited to 'client/mysqldump.c')
| -rw-r--r-- | client/mysqldump.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index a2ed3c0504c..cbb3a7d3ff7 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -4298,7 +4298,8 @@ static int dump_tablespaces(char* ts_where) " EXTRA" " FROM INFORMATION_SCHEMA.FILES" " WHERE FILE_TYPE = 'UNDO LOG'" - " AND FILE_NAME IS NOT NULL", + " AND FILE_NAME IS NOT NULL" + " AND LOGFILE_GROUP_NAME IS NOT NULL", 256, 1024); if(ts_where) { @@ -4313,7 +4314,7 @@ static int dump_tablespaces(char* ts_where) } dynstr_append_checked(&sqlbuf, " GROUP BY LOGFILE_GROUP_NAME, FILE_NAME" - ", ENGINE" + ", ENGINE, TOTAL_EXTENTS, INITIAL_SIZE" " ORDER BY LOGFILE_GROUP_NAME"); if (mysql_query(mysql, sqlbuf.str) || |