5 files changed, 35 insertions, 5 deletions
diff --git a/mysql-test/main/create_user.test b/mysql-test/main/create_user.test
index f04cb3e302a..686e2faf2c2 100644
--- a/mysql-test/main/create_user.test
+++ b/mysql-test/main/create_user.test
@@ -50,9 +50,9 @@ create user if not exists foo, foo2 identified by 'password2'
 select * from mysql.user where user like 'foo';
 drop user foo, foo2;
 
-create user foo with MAX_QUERIES_PER_HOUR 10
+create user foo ,foo2 with MAX_QUERIES_PER_HOUR 10
                      MAX_UPDATES_PER_HOUR 20
                      MAX_CONNECTIONS_PER_HOUR 30
                      MAX_USER_CONNECTIONS 40;
-select * from mysql.user where user like 'foo';
-drop user foo;
+select * from mysql.user where user like 'foo%';
+drop user foo, foo2;
diff --git a/mysql-test/main/grant.test b/mysql-test/main/grant.test
index c3bb987acc8..5d7c85630f3 100644
--- a/mysql-test/main/grant.test
+++ b/mysql-test/main/grant.test
@@ -160,12 +160,12 @@ create table t1 (a int);
 grant ALL PRIVILEGES on *.* to drop_user2@localhost with GRANT OPTION;
 show grants for drop_user2@localhost;
 revoke all privileges, grant option from drop_user2@localhost;
-drop user drop_user2@localhost;
 
-grant ALL PRIVILEGES on *.* to drop_user@localhost with GRANT OPTION;
+grant ALL PRIVILEGES on *.* to drop_user@localhost , drop_user2@localhost with GRANT OPTION, ;
 grant ALL PRIVILEGES on test.* to drop_user@localhost with GRANT OPTION;
 grant select(a) on test.t1 to drop_user@localhost;
 show grants for drop_user@localhost;
+drop user drop_user2@localhost;
 
 #
 # Bug#3086 SHOW GRANTS doesn't follow ANSI_QUOTES
diff --git a/mysql-test/main/uu.test b/mysql-test/main/uu.test
new file mode 100644
index 00000000000..72be61ec8ed
--- /dev/null
+++ b/mysql-test/main/uu.test
@@ -0,0 +1,7 @@
+--source include/have_binlog_format_row.inc
+create user foo identified by password "2470C0C06DEE42FD1618BB99005ADCA2EC9D1E919", foo2 identified by 'password' require CIPHER 'cipher' 
+                                                   AND SUBJECT 'subject'
+                                                   AND ISSUER 'issuer'
+                     with MAX_UPDATES_PER_HOUR 20;
+select * from mysql.user where user like 'foo%';
+drop user foo, foo2;
diff --git a/mysql-test/suite/rpl/t/rename_tmp_tbl.test b/mysql-test/suite/rpl/t/rename_tmp_tbl.test
new file mode 100644
index 00000000000..43a4376afa2
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rename_tmp_tbl.test
@@ -0,0 +1,16 @@
+--source include/have_binlog_format_row.inc
+--source include/master-slave.inc
+
+CREATE TEMPORARY TABLE t1 (a INT);
+CREATE TEMPORARY TABLE t2 (a INT);
+CREATE TABLE t4 (a INT);
+drop table t4;
+
+drop temporary table if exists t2;
+drop temporary table if exists t1;
+#--error 0,1146
+#RENAME TABLE t1 TO tmp;
+
+--sync_slave_with_master
+--connection master
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_drop_split.test b/mysql-test/suite/rpl/t/rpl_drop_split.test
new file mode 100644
index 00000000000..05c4fe8dbd3
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_drop_split.test
@@ -0,0 +1,7 @@
+--source include/master-slave.inc
+--source include/have_binlog_format_statement.inc
+create table t1(a int);
+create temporary table t2(b int);
+
+drop table t1,t2;
+--source include/rpl_end.inc