fixed test results

mysql-test/r/rpl_insert_id.result:
  fixed error format after mats merge
mysql-test/r/sp.result:
  fixed typo

mysql-test/r/rpl_insert_id.result

@@ -72,4 +72,4 @@ SET TIMESTAMP=1000000000;
 CREATE TABLE t1 ( a INT UNIQUE );
 SET FOREIGN_KEY_CHECKS=0;
 INSERT INTO t1 VALUES (1),(1);
-Duplicate entry '1' for key 1
+ERROR 23000: Duplicate entry '1' for key 1

mysql-test/r/sp.result

@@ -2096,8 +2096,7 @@ s1	count(s1)
 1	1
 NULL	2
 drop procedure bug7013|
-drop table if exists t4;
---enable_warnings|
+drop table if exists t4|
 create table t4 (
 a mediumint(8) unsigned not null auto_increment,
 b smallint(5) unsigned not null,