bk commit into 5.1 tree (stewart:1.2306) BUG#20839

[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-17 00:15:58+10:00, stewart@willster.(none) +1 -0
  BUG#20839 Illegal error code: 155 returned downgrading from 5.1.12-> 5.1.11
  
  Post review fix:
  Magnus suggested making sure that new mysqldump still worked flawlessly
  with old servers.

  client/mysqldump.c@stripped, 2006-10-17 00:15:55+10:00, stewart@willster.(none) +17 -1
    Print informational comment about not dumping tablespaces if connecting
    to a server that doesn't have the I_S.FILES table

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

--- 1.253/client/mysqldump.c	2006-10-17 00:16:04 +10:00
+++ 1.254/client/mysqldump.c	2006-10-17 00:16:04 +10:00
@@ -2877,8 +2877,24 @@
            ", ENGINE"
            " ORDER BY LOGFILE_GROUP_NAME");
 
-  if (mysql_query_with_error_report(mysql, &tableres,sqlbuf))
+  if (mysql_query(mysql, sqlbuf) ||
+      !(tableres = mysql_store_result(mysql)))
+  {
+    if (mysql_errno(mysql) == ER_BAD_TABLE_ERROR ||
+        mysql_errno(mysql) == ER_BAD_DB_ERROR ||
+        mysql_errno(mysql) == ER_UNKNOWN_TABLE)
+    {
+      fprintf(md_result_file,
+              "\n--\n-- Not dumping tablespaces as no INFORMATION_SCHEMA.FILES"
+              " table on this server\n--\n");
+      check_io(md_result_file);
+      return 0;
+    }
+
+    my_printf_error(0, "Error: Couldn't dump tablespaces %s",
+                    MYF(0), mysql_error(mysql));
     return 1;
+  }
 
   buf[0]= 0;
   while ((row= mysql_fetch_row(tableres)))