diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 0e32097266d..73f65449f55 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2600,7 +2600,9 @@ unsent_create_error:
 	  check_access(thd, SELECT_ACL | EXTRA_ACL, tables->db,
 		       &tables->grant.privilege,0,0))
 	goto error;
-      res = mysqld_show_create(thd, tables);
+      if (grant_option && check_grant(thd, SELECT_ACL, tables, 2, UINT_MAX, 0))
+	goto error;
+      res= mysqld_show_create(thd, tables);
       break;
     }
 #endif