main.gis_notembedded fails when default charset is utf8

CURRENT_TEST: main.gis_notembedded

safe_process[24538]: parent_pid: 20585

safe_process[24538]: Started child 24539, terminated: 0

--- /tmp/guix-build-mariadb-10.1.43.drv-0/mariadb-10.1.43/mysql-test/r/gis_notembedded.result   1970-01-01 00:00:00.000000000 +0000

+++ /tmp/guix-build-mariadb-10.1.43.drv-0/mariadb-10.1.43/mysql-test/r/gis_notembedded.reject   2019-12-09 22:47:49.123631028 +0000

@@ -4,14 +4,14 @@

    t_name varchar(64), geometry_column varchar(64), t_srid int)

     SQL SECURITY INVOKER

 begin

-  set @qwe= concat('ALTER TABLE ', t_schema, '.', t_name, ' ADD ', geometry_column,' GEOMETRY REF_SYSTEM_ID=', t_srid); PREPARE ls from @qwe; execute ls; deallocate prepare ls; end   latin1  latin1_swedish_ci       latin1_swedish_ci

+  set @qwe= concat('ALTER TABLE ', t_schema, '.', t_name, ' ADD ', geometry_column,' GEOMETRY REF_SYSTEM_ID=', t_srid); PREPARE ls from @qwe; execute ls; deallocate prepare ls; end   utf8    utf8_general_ci utf8_general_ci

 show create procedure mysql.DropGeometryColumn;

 Procedure      sql_mode        Create Procedure        character_set_client    collation_connection    Database Collation

 DropGeometryColumn             CREATE DEFINER=`root`@`localhost` PROCEDURE `DropGeometryColumn`(catalog varchar(64), t_schema varchar(64),

    t_name varchar(64), geometry_column varchar(64))

     SQL SECURITY INVOKER

 begin

-  set @qwe= concat('ALTER TABLE ', t_schema, '.', t_name, ' DROP ', geometry_column); PREPARE ls from @qwe; execute ls; deallocate prepare ls; end     latin1  latin1_swedish_ci       latin1_swedish_ci

+  set @qwe= concat('ALTER TABLE ', t_schema, '.', t_name, ' DROP ', geometry_column); PREPARE ls from @qwe; execute ls; deallocate prepare ls; end     utf8    utf8_general_ci utf8_general_ci

 create table t1 (a int, b int);

 call mysql.AddGeometryColumn('', 'test', 't1', 'c', 10);

 show create table t1;

mysqltest: Result length mismatch