Merge stella.local:/home2/mydev/mysql-5.1-amain

into stella.local:/home2/mydev/mysql-5.1-axmrg

Merge stella.local:/home2/mydev/mysql-5.1-amain
into stella.local:/home2/mydev/mysql-5.1-axmrg
c887bd6a · istruewing@stella.local · 0eec7df9 · e4e8cb3a · c887bd6a · c887bd6a
Commit c887bd6a authored Nov 12, 2007 by istruewing@stella.local
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