diff options
| author | unknown <stewart@willster.(none)> | 2006-09-20 17:23:46 +1000 |
|---|---|---|
| committer | unknown <stewart@willster.(none)> | 2006-09-20 17:23:46 +1000 |
| commit | 080efad84e0100673a3fa6a85faf82c68a88e8cb (patch) | |
| tree | a4df58358ff119befb19c9e4db27b372a5aa7a19 /client/mysqldump.c | |
| parent | 54d5a79ea99b765ebef164008d021a7f0a3dda18 (diff) | |
| parent | 11d3c64f67914dc456f6526d36abcb70a29726ec (diff) | |
| download | mariadb-git-080efad84e0100673a3fa6a85faf82c68a88e8cb.tar.gz | |
Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
into willster.(none):/home/stewart/Documents/MySQL/5.1/bug20809
client/mysqldump.c:
Auto merged
Diffstat (limited to 'client/mysqldump.c')
| -rw-r--r-- | client/mysqldump.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 2fb7e7164ac..bfafa92008e 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -2750,6 +2750,12 @@ static int dump_all_tablespaces() MYSQL_RES *tableres; char buf[FN_REFLEN]; int first; + /* + The following are used for parsing the EXTRA field + */ + char extra_format[]= "UNDO_BUFFER_SIZE="; + char *ubs; + char *endsemi; if (mysql_query_with_error_report(mysql, &tableres, "SELECT DISTINCT" @@ -2757,7 +2763,8 @@ static int dump_all_tablespaces() " FILE_NAME," " TOTAL_EXTENTS," " INITIAL_SIZE," - " ENGINE" + " ENGINE," + " EXTRA" " FROM INFORMATION_SCHEMA.FILES" " WHERE FILE_TYPE = \"UNDO LOG\"" " AND FILE_NAME IS NOT NULL" @@ -2789,9 +2796,16 @@ static int dump_all_tablespaces() row[1]); if (first) { + ubs= strstr(row[5],extra_format); + if(!ubs) + break; + ubs+= strlen(extra_format); + endsemi= strstr(ubs,";"); + if(endsemi) + endsemi[0]= '\0'; fprintf(md_result_file, " UNDO_BUFFER_SIZE %s\n", - row[2]); + ubs); } fprintf(md_result_file, " INITIAL_SIZE %s\n" |