Merge mysql.com:/home/jimw/my/mysql-4.1-16389

into mysql.com:/home/jimw/my/mysql-4.1-clean

Merge mysql.com:/home/jimw/my/mysql-4.1-16389
into mysql.com:/home/jimw/my/mysql-4.1-clean
d70c47b2 · jimw@mysql.com · 678e075e · 970aa54b · d70c47b2
Commit d70c47b2 authored Feb 14, 2006 by jimw@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

client/mysqldump.c client/mysqldump.c +5 -2

No files found.
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -2557,8 +2557,11 @@ static const char *check_if_ignore_table(const char *table_name)
    mysql_free_result(res);
    return 0;					/* assume table is ok */
  }
-  if (strcmp(row[1], (result= "MRG_MyISAM")) &&
+  /* Some forward-compatibility: don't dump data from a VIEW */
-      strcmp(row[1], (result= "MRG_ISAM")))
+  if (!row[1])
+    result= "VIEW";
+  else if (strcmp(row[1], (result= "MRG_MyISAM")) &&
+           strcmp(row[1], (result= "MRG_ISAM")))
    result= 0;
  mysql_free_result(res);
  return result;