bk commit into 5.1 tree (stewart:1.2299) 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-10-05 00:56:06+10:00, stewart@willster.(none) +1 -0
  BUG#20809 mysqldump does not backup TS and LG information correctly
  
  restore of the dump (ndb_dd_dump test) was failing for probably a merge problem. fixed now.

  client/mysqldump.c@stripped, 2006-10-05 00:56:02+10:00, stewart@willster.(none) +3 -1
    fix query to make dump restorable

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

--- 1.251/client/mysqldump.c	2006-10-05 00:56:12 +10:00
+++ 1.252/client/mysqldump.c	2006-10-05 00:56:12 +10:00
@@ -2758,7 +2758,7 @@
   char *endsemi;
 
   if (mysql_query_with_error_report(mysql, &tableres,
-                                    "SELECT DISTINCT"
+                                    "SELECT"
                                     " LOGFILE_GROUP_NAME,"
                                     " FILE_NAME,"
                                     " TOTAL_EXTENTS,"
@@ -2768,6 +2768,8 @@
                                     " FROM INFORMATION_SCHEMA.FILES"
                                     " WHERE FILE_TYPE = \"UNDO LOG\""
                                     " AND FILE_NAME IS NOT NULL"
+                                    " GROUP BY LOGFILE_GROUP_NAME, FILE_NAME"
+                                    ", ENGINE"
                                     " ORDER BY LOGFILE_GROUP_NAME"))
     return 1;