mysql-test/r/grant2.result:
  Update test result
mysql-test/t/grant2.test:
  Explicitly specify "columns" when inserting into mysql.user and mysql.db