bk commit into 5.1 tree (stewart:1.2316)

[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-20 17:23:46+10:00, stewart@willster.(none) +1 -0
  Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
  into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20809
  MERGE: 1.2307.2.1

  client/mysqldump.c@stripped, 2006-09-20 17:23:41+10:00, stewart@willster.(none) +0 -1
    Auto merged
    MERGE: 1.245.2.1

# 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/RESYNC

--- 1.250/client/mysqldump.c	2006-09-20 17:23:51 +10:00
+++ 1.251/client/mysqldump.c	2006-09-20 17:23:51 +10:00
@@ -2750,6 +2750,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"
@@ -2757,7 +2763,8 @@
                                     " 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 @@
             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"