Package-wide TYPE variable declarations fail during mariadb-dump restore

--------------

CREATE DEFINER="root"@"localhost" PROCEDURE "p1"()

AS

  r pkg1.rec0_t;

BEGIN r.a:=1; SELECT r.a; END

--------------

ERROR 4161 (HY000) at line 27 in file: 'backup.sql': Unknown data type: '`pkg1`.`rec0_t`'

Query OK, 0 rows affected (0.000 sec)

SET sql_mode=ORACLE;

DELIMITER $$;

CREATE PACKAGE pkg1 AS

  TYPE rec0_t IS RECORD (a INT, b VARCHAR(30));

END;

$$

CREATE PROCEDURE p1 AS

  r pkg1.rec0_t;

BEGIN r.a:=1; SELECT r.a; END;

$$

DELIMITER ;$$

--exec $MYSQL_DUMP --skip-comments --routines --databases test > $MYSQLTEST_VARDIR/tmp/i2.sql

DROP DATABASE test;

CREATE DATABASE test;

# Default reload aborts at p1 (dumped before pkg1) -> exit 1, nothing restored

--error 1

--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/i2.sql 2>&1

USE test;

# both procedure and package missing

SELECT routine_name FROM information_schema.routines WHERE routine_schema='test';

--remove_file $MYSQLTEST_VARDIR/tmp/i2.sql