sql/mysqld.cc: Fixes bad merge. mysql-test/r/grant.result: Fix bad merge.
Attach a file by drag & drop or click to upload
