Merge olga.mysql.com:/home/igor/mysql-5.0-opt

into  olga.mysql.com:/home/igor/mysql-5.1-opt


mysql-test/t/grant.test:
  Auto merged
mysql-test/r/grant.result:
  Manual merge
This commit is contained in:
unknown 2007-05-11 21:51:14 -07:00
commit 42cc0e874f

View File

@ -1257,7 +1257,7 @@ UPDATE v1 SET f2 = 4;
SELECT * FROM test.t1;
disconnect user1;
connection default;
DROP VIEW v1;
DROP DATABASE db27878;
use test;
DROP TABLE t1;