mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
Merge mysql.com:/home/jimw/my/mysql-4.1-16389
into mysql.com:/home/jimw/my/mysql-4.1-clean
This commit is contained in:
commit
4f9faf5ef8
1 changed files with 5 additions and 2 deletions
|
@ -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")) &&
|
||||
strcmp(row[1], (result= "MRG_ISAM")))
|
||||
/* 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);
|
||||
return result;
|
||||
|
|
Loading…
Reference in a new issue