Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1

into mysql.com:/home/kent/bk/bug30069/mysql-5.1-build

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/kent/bk/bug30069/mysql-5.1-build
c667dc61 · kent@kent-amd64.(none) · aee02b2a · e4e8cb3a · c667dc61 · c667dc61
Commit c667dc61 authored Nov 12, 2007 by kent@kent-amd64.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

mysql-test/r/mysqlbinlog.result mysql-test/r/mysqlbinlog.result +1 -0

mysql-test/t/mysqlbinlog.test mysql-test/t/mysqlbinlog.test +1 -0

No files found.
--- 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