Bug #39129 "SHOW CREATE VIEW" outputs additional columns, missing in test

Description:
Test failures detected during the build of cluster 6.3.17,
because the result files were not updated with server functional changes.

See these test failure beginnings:

=====
funcs_1.innodb_func_view       [ fail ]

--- /PATH/mysql-test/suite/funcs_1/r/innodb_func_view.result
+++ /PATH/mysql-test/suite/funcs_1/r/innodb_func_view.reject
@@ -289,8 +289,8 @@
 SELECT my_char_30, id FROM t1_values
 WHERE select_id = 193 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
-View   Create View
-v1     CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1_val
ues`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
+View   Create View     character_set_client    collation_connection
+v1     CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1_val
ues`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`     latin1  latin1_swedish_ci
 SELECT v1.* FROM v1
.....
=====

=====
funcs_1.memory_func_view       [ fail ]

--- /PATH/mysql-test/suite/funcs_1/r/memory_func_view.result
+++ /PATH/mysql-test/suite/funcs_1/r/memory_func_view.reject
@@ -289,8 +289,8 @@
 SELECT my_char_30, id FROM t1_values
 WHERE select_id = 193 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
-View   Create View
-v1     CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1_val
ues`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
+View   Create View     character_set_client    collation_connection
+v1     CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1_val
ues`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`     latin1  latin1_swedish_ci
 SELECT v1.* FROM v1
.....
=====

=====
funcs_1.myisam_func_view       [ fail ]

--- /PATH/mysql-test/suite/funcs_1/r/myisam_func_view.result
+++ /PATH/mysql-test/suite/funcs_1/r/myisam_func_view.reject
@@ -289,8 +289,8 @@
 SELECT my_char_30, id FROM t1_values
 WHERE select_id = 193 OR select_id IS NULL order by id;
 SHOW CREATE VIEW v1;
-View   Create View
-v1     CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1_val
ues`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`
+View   Create View     character_set_client    collation_connection
+v1     CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1_val
ues`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values`     latin1  latin1_swedish_ci
 SELECT v1.* FROM v1
.....
=====

How to repeat:
Run the extra tests.

Suggested fix:
Run the extra tests, when changing the server functionality.

That version is based on the current main 5.1 tree,
and I assume the "SHOW CREATE VIEW" change will also show up there.

Test passes in the main tree, in all relevant versions (5.1.27 to 5.1.29).

But the "result" file in those versions is identical, and it differs from that in the cluster-6.3.17 build in which this test failure occurred, even though that is claimed to be based on 5.1.27.

The difference between the 5.1.27 result file and that of the cluster-6.3.17 tree starts exacly like this test failure starts.

I suspect that an old result file was used, which wasn't applicable to 5.1.27.

Probably a faulty merge.