diff options
| author | unknown <kostja@bodhi.local> | 2006-08-30 23:09:47 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-08-30 23:09:47 +0400 |
| commit | 0ec1397d035e25dcbf8eb9e63f65472977163cfe (patch) | |
| tree | 5daf021ef77cac4c13943d4e132107ec95b28e1e /mysql-test/t/grant.test | |
| parent | 5fab3969af3d73abff00cb16c356c106698b97e1 (diff) | |
| download | mariadb-git-0ec1397d035e25dcbf8eb9e63f65472977163cfe.tar.gz | |
Post-merge fixes.
mysql-test/lib/mtr_process.pl:
Apply manually the merge from 5.0
mysql-test/mysql-test-run.pl:
Apply manually the merge from 5.0
mysql-test/r/grant.result:
A post-merge fix.
mysql-test/r/im_cmd_line.result:
A post-merge fix.
mysql-test/r/im_instance_conf.result:
A post-merge fix.
mysql-test/r/sp.result:
A post-merge fix.
mysql-test/t/grant.test:
A post-merge fix.
mysql-test/t/im_cmd_line.imtest:
A post-merge fix.
mysql-test/t/im_instance_conf.imtest:
A post-merge fix.
sql/field.cc:
A post-merge fix.
sql/item_cmpfunc.cc:
A post-merge fix.
sql/sp_head.cc:
A post-merge fix.
sql/sp_head.h:
A post-merge fix.
Diffstat (limited to 'mysql-test/t/grant.test')
| -rw-r--r-- | mysql-test/t/grant.test | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/t/grant.test b/mysql-test/t/grant.test index 5bacbf7d50f..d3689a07237 100644 --- a/mysql-test/t/grant.test +++ b/mysql-test/t/grant.test @@ -807,7 +807,8 @@ DROP DATABASE mysqltest3; REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'mysqltest_1'@'localhost'; DROP USER 'mysqltest_1'@'localhost'; - +# restore the original database +use test; # # Bug #10668: CREATE USER does not enforce username length limit |