diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-02-26 14:25:59 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-02-26 14:25:59 +0100 |
| commit | c431ab112dd1afb34a8e5029c638ccf0289a78cf (patch) | |
| tree | 51cdb10a0d9eb61b6b3036f2ec898e83f357c172 /mysql-test/t/grant2.test | |
| parent | 1e98e7bfb241ec843bb289503c24bff34fbfe01f (diff) | |
| parent | 5d4e0417ad5a4b7758f216f86ad91b97287eec29 (diff) | |
| download | mariadb-git-c431ab112dd1afb34a8e5029c638ccf0289a78cf.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166
into pilot.blaudden:/home/msvensson/mysql/bug20166/my51-bug20166
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
Auto merged
BitKeeper/deleted/.del-mysql_create_system_tables.sh:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/join.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/grant2.test:
Auto merged
mysql-test/t/init_connect.test:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
mysql-test/t/ndb_index_ordered.test:
Auto merged
mysql-test/t/ndb_multi.test:
Auto merged
scripts/Makefile.am:
Auto merged
BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7:
Auto merged
mysql-test/r/mysql_upgrade.result:
SCCS merged
mysql-test/t/lock_multi.test:
Use local
mysql-test/t/rpl_temporary.test:
Use local
mysql-test/Makefile.am:
Manual merge
scripts/mysql_fix_privilege_tables.sh:
Manual merge
scripts/mysql_fix_privilege_tables.sql.in:
Manual merge
scripts/mysql_install_db.sh:
Manual merge
Diffstat (limited to 'mysql-test/t/grant2.test')
| -rw-r--r-- | mysql-test/t/grant2.test | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/t/grant2.test b/mysql-test/t/grant2.test index a533af995dc..866c5a8a4b3 100644 --- a/mysql-test/t/grant2.test +++ b/mysql-test/t/grant2.test @@ -395,6 +395,8 @@ delete from mysql.user where user like 'mysqltest\_1'; flush privileges; drop database mysqltest_1; +--source include/add_anonymous_users.inc + # But anonymous users can't change their password connect (n5,localhost,test,,test,$MASTER_MYPORT,$MASTER_MYSOCK); connection n5; @@ -403,6 +405,8 @@ set password = password("changed"); disconnect n5; connection default; +--source include/delete_anonymous_users.inc + # Bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in # multi-threaded environment". We should be able to execute FLUSH |