summaryrefslogtreecommitdiff
path: root/client/mysqldump.c
diff options
context:
space:
mode:
authorSatya B <satya.bn@sun.com>2009-03-19 14:19:51 +0530
committerSatya B <satya.bn@sun.com>2009-03-19 14:19:51 +0530
commit5c49e6ebb38467d0fd6fc65bbeb1eecbe13f2f70 (patch)
tree7a338d6b708fbda61ade36477a94e80718b415f7 /client/mysqldump.c
parent53849a24f97ad28a46dfb2a76a987676dda476fe (diff)
parent322fe7419f56cbb9ff4d7ded4de852c63b67b0e0 (diff)
downloadmariadb-git-5c49e6ebb38467d0fd6fc65bbeb1eecbe13f2f70.tar.gz
Merge 5.0-bugteam to 5.1-bugteam
Diffstat (limited to 'client/mysqldump.c')
-rw-r--r--client/mysqldump.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c
index 0f75f0b7315..bc1186261ec 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -4588,7 +4588,8 @@ char check_if_ignore_table(const char *table_name, char *table_type)
*/
if (!opt_no_data &&
(!my_strcasecmp(&my_charset_latin1, table_type, "MRG_MyISAM") ||
- !strcmp(table_type,"MRG_ISAM")))
+ !strcmp(table_type,"MRG_ISAM") ||
+ !strcmp(table_type,"FEDERATED")))
result= IGNORE_DATA;
}
mysql_free_result(res);