diff options
| author | unknown <jimw@mysql.com> | 2006-02-14 18:12:30 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-02-14 18:12:30 -0800 |
| commit | 4f9faf5ef89bfe5cbedf5d35a0e520124cc09554 (patch) | |
| tree | c589b35ef32684b8bdad51b87d25e266475ce34c /client | |
| parent | bdb953bd9d9e8a92ebe73c809378632b1eee5e69 (diff) | |
| parent | f7a6e249346826cad72f54df8acf9435cb01627b (diff) | |
| download | mariadb-git-4f9faf5ef89bfe5cbedf5d35a0e520124cc09554.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-16389
into mysql.com:/home/jimw/my/mysql-4.1-clean
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 7ff9504607f..64629bcf608 100644 --- 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")) && - 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; |