After merge fix.

mysql-test/t/trigger.test

@@ -388,10 +388,10 @@ use test;
 # "Triggers: Allowed to create triggers on a subject table in a different DB". 
 create database mysqltest;
 create table mysqltest.t1 (i int);
---error 1429
+--error ER_TRG_IN_WRONG_SCHEMA
 create trigger trg1 before insert on mysqltest.t1 for each row set @a:= 1;
 use mysqltest;
---error 1429
+--error ER_TRG_IN_WRONG_SCHEMA
 create trigger test.trg1 before insert on t1 for each row set @a:= 1;
 drop database mysqltest;
 use test;