Roles with trailing white spaces are not cleared correctly

roles.create_and_grant_role              w2 [ fail ]

        Test ended at 2016-11-25 17:38:48

CURRENT_TEST: roles.create_and_grant_role

--- /usr/share/mysql/mysql-test/suite/roles/create_and_grant_role.result	2016-11-25 13:01:58.000000000 +0200

+++ /run/shm/var/2/log/create_and_grant_role.reject	2016-11-25 17:38:47.911410836 +0200

@@ -16,6 +16,7 @@

 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION

 GRANT PROXY ON ''@'%' TO 'root'@'localhost' WITH GRANT OPTION

 GRANT USAGE ON *.* TO 'r1'

+GRANT foo   TO 'root'@'localhost' WITH ADMIN OPTION

 GRANT r1 TO 'root'@'localhost' WITH ADMIN OPTION

 drop role r1;

 select * from mysql.roles_mapping;

@@ -24,3 +25,4 @@

 Grants for root@localhost

 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION

 GRANT PROXY ON ''@'%' TO 'root'@'localhost' WITH GRANT OPTION

+GRANT foo   TO 'root'@'localhost' WITH ADMIN OPTION

mysqltest: Result length mismatch

create role 'foo  ';

select concat(user, '__'), host from mysql.user;

select * from mysql.roles_mapping;

drop role foo;

select concat(user, '__'), host from mysql.user;

select * from mysql.roles_mapping;

--sorted_result

show grants;

-- Here we see

Grants for root@localhost

GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION

GRANT PROXY ON ''@'%' TO 'root'@'localhost' WITH GRANT OPTION

GRANT foo   TO 'root'@'localhost' WITH ADMIN OPTION