diff options
author | jimw@mysql.com <> | 2006-02-01 12:28:39 -0800 |
---|---|---|
committer | jimw@mysql.com <> | 2006-02-01 12:28:39 -0800 |
commit | 970aa54bd68ea425923248295be8d52f1f52b039 (patch) | |
tree | 6bc7daa54a749d38338a474e1637083f3df39e5d /client | |
parent | f7ff3d653a7aeeb327aafe244c330800ab5f0f78 (diff) | |
download | mariadb-git-970aa54bd68ea425923248295be8d52f1f52b039.tar.gz |
Fix mysqldump crash when encountering a VIEW (when used against a
5.0 or later server, obviously). (Bug #16389)
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; |