Merging 5.1 main into 5.1-rpl

1 files changed, 8 insertions, 1 deletions

diff --git a/client/mysqldump.c b/client/mysqldump.c
index 58959f56a89..c068b2ff16e 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -2396,8 +2396,15 @@ static uint get_table_structure(char *table, char *db, char *table_type,
             fprintf(sql_file, ",\n  %s %s",
                     quote_name(row[0], name_buff, 0), row[1]);
           }
+
+          /*
+            Stand-in tables are always MyISAM tables as the default
+            engine might have a column-limit that's lower than the
+            number of columns in the view, and MyISAM support is
+            guaranteed to be in the server anyway.
+          */
           fprintf(sql_file,
-                  "\n) */;\n"
+                  "\n) ENGINE=MyISAM */;\n"
                   "SET character_set_client = @saved_cs_client;\n");
 
           check_io(sql_file);