Commit d70c47b2 authored by jimw@mysql.com's avatar jimw@mysql.com
Browse files

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

into  mysql.com:/home/jimw/my/mysql-4.1-clean
parents 678e075e 970aa54b

client/mysqldump.c

+5 −2
Original line number Diff line number Diff line
@@ -2557,7 +2557,10 @@ 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 */

  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);