Skip to content

M
mariadb
Commit 37e64bd3 authored by unknown's avatar unknown
Browse files
Options

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

into  mysql.com:/home/kent/bk/bug30069/mysql-5.1-build
parents 58c1e112 c4f94b70
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
mysql-test/r/mysqlbinlog.result
View file @ 37e64bd3
...@@ -350,4 +350,5 @@ SELECT * FROM t1; ...@@ -350,4 +350,5 @@ SELECT * FROM t1;
a b a b
1 root@localhost 1 root@localhost
DROP DATABASE mysqltest1; DROP DATABASE mysqltest1;
DROP USER untrusted@localhost;
End of 5.1 tests End of 5.1 tests
mysql-test/t/mysqlbinlog.test
View file @ 37e64bd3
...@@ -276,5 +276,6 @@ INSERT INTO t1 VALUES (1,USER()); ...@@ -276,5 +276,6 @@ INSERT INTO t1 VALUES (1,USER());
SELECT * FROM t1; SELECT * FROM t1;
connection default; connection default;
DROP DATABASE mysqltest1; DROP DATABASE mysqltest1;
DROP USER untrusted@localhost;
--echo End of 5.1 tests --echo End of 5.1 tests
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7