bk commit into 5.1 tree (stewart:1.2308) BUG#20809

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-19 17:07:21+10:00, stewart@willster.(none) +1 -0
  BUG#20809 mysqldump does not backup TS and LG information correctly.
  
  We were not parsing the EXTRA field to get UNDO_BUFFER_SIZE for the
  CREATE LOGFILE GROUP statement in the dump.

  client/mysqldump.c@stripped, 2006-09-19 17:07:17+10:00, stewart@willster.(none) +17 -2
    parse the EXTRA field of INFORMATION_SCHEMA.FILES to determine the UNDO_BUFFER_SIZE

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/bug20809

--- 1.245/client/mysqldump.c	2006-09-19 17:07:27 +10:00
+++ 1.246/client/mysqldump.c	2006-09-19 17:07:27 +10:00
@@ -2737,6 +2737,12 @@
   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"
@@ -2744,9 +2750,11 @@
                                     " FILE_NAME,"
                                     " TOTAL_EXTENTS,"
                                     " INITIAL_SIZE,"
-                                    " ENGINE"
+                                    " ENGINE,"
+                                    " EXTRA"
                                     " FROM INFORMATION_SCHEMA.FILES"
                                     " WHERE FILE_TYPE = \"UNDO LOG\""
+                                    " AND FILE_NAME IS NOT NULL"
                                     " ORDER BY LOGFILE_GROUP_NAME"))
     return 1;
 
@@ -2775,9 +2783,16 @@
             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"