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.