Merge with 4.0 to get security patch for check_grant_colum

mysql-test/r/rpl_server_id2.result

@@ -20,4 +20,5 @@ select * from t1;
 n
 1
 1
+stop slave;
 drop table t1;

mysql-test/t/rpl_server_id2.test

@@ -18,4 +18,8 @@ insert into t1 values (1);
 save_master_pos;
 sync_with_master;
 select * from t1; # check that indeed 2 were inserted
+# We stop the slave before cleaning up otherwise we'll get
+# 'drop table t1' executed twice, so an error in the slave.err
+# (not critical).
+stop slave;
 drop table t1;