Merge hynda.mysql.fi:/home/my/mysql-5.1-main

into hynda.mysql.fi:/home/my/mysql-5.1-marvel
2007-11-12 13:43:46 +02:00 · 2007-11-12 13:43:46 +02:00 · 4f6c7eece3
commit 4f6c7eece3
parent 259a3cb7a3 c4f94b70bd
2 changed files with 2 additions and 0 deletions
--- a/mysql-test/r/mysqlbinlog.result
+++ b/mysql-test/r/mysqlbinlog.result
@ -350,4 +350,5 @@ SELECT * FROM t1;
 a	b
 1	root@localhost
 DROP DATABASE mysqltest1;
+DROP USER untrusted@localhost;
 End of 5.1 tests
--- a/mysql-test/t/mysqlbinlog.test
+++ b/mysql-test/t/mysqlbinlog.test
@ -276,5 +276,6 @@ INSERT INTO t1 VALUES (1,USER());
 SELECT * FROM t1;
 connection default;
 DROP DATABASE mysqltest1;
+DROP USER untrusted@localhost;

 --echo End of 5.1 tests