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

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

into  mysql.com:/home/jimw/my/mysql-4.1-clean
parents 678e075e 970aa54b
...@@ -2557,7 +2557,10 @@ static const char *check_if_ignore_table(const char *table_name) ...@@ -2557,7 +2557,10 @@ static const char *check_if_ignore_table(const char *table_name)
mysql_free_result(res); mysql_free_result(res);
return 0; /* assume table is ok */ 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"))) strcmp(row[1], (result= "MRG_ISAM")))
result= 0; result= 0;
mysql_free_result(res); mysql_free_result(res);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment