Merge neptunus.(none):/home/msvensson/mysql/bug15775_part2/my41-bug15775_part2

into  neptunus.(none):/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2


mysql-test/r/grant2.result:
  Merge test results
mysql-test/t/grant2.test:
  Merge tests
sql/sql_acl.cc:
  Removing the 4.1 version patch

1 files changed, 12 insertions, 0 deletions

diff --git a/mysql-test/r/grant2.result b/mysql-test/r/grant2.result
index 9c744396403..bda470832b3 100644
--- a/mysql-test/r/grant2.result
+++ b/mysql-test/r/grant2.result
@@ -107,6 +107,18 @@ delete from mysql.columns_priv where user like 'mysqltest\_%';
 flush privileges;
 drop database mysqltest;
 use test;
+insert into mysql.user (user, host) values
+('mysqltest_1', 'host1'),
+('mysqltest_2', 'host2'),
+('mysqltest_3', 'host3'),
+('mysqltest_4', 'host4'),
+('mysqltest_5', 'host5'),
+('mysqltest_6', 'host6'),
+('mysqltest_7', 'host7');
+flush privileges;
+drop user mysqltest_3@host3;
+drop user mysqltest_1@host1, mysqltest_2@host2, mysqltest_4@host4,
+mysqltest_5@host5, mysqltest_6@host6, mysqltest_7@host7;
 set sql_mode='maxdb';
 drop table if exists t1, t2;
 create table t1(c1 int);