Merge mockturtle.local:/home/dlenev/src/mysql-5.0-like

into  mockturtle.local:/home/dlenev/src/mysql-5.1-like-2


sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  5.1 version of mysql_priv.h already contains all necessary changes.
sql/sql_parse.cc:
  5.1 version of sql_parse.cc already contains all necessary changes.
sql/sql_table.cc:
  5.1 version of sql_table.cc already contains all necessary changes.
sql/sql_yacc.yy:
  SCCS merged
mysql-test/r/grant2.result:
  Manual merge.
mysql-test/t/grant2.test:
  Manual merge.

mysql-test/r/grant2.result

@@ -404,3 +404,4 @@ use test;
 drop database mysqltest_1;
 drop database mysqltest_2;
 drop user mysqltest_u1@localhost;
+End of 5.0 tests

mysql-test/t/grant2.test

@@ -554,3 +554,6 @@ use test;
 drop database mysqltest_1;
 drop database mysqltest_2;
 drop user mysqltest_u1@localhost;
+
+--echo End of 5.0 tests
+