Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1

into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
aac5f57b · jani@ua141d10.elisa.omakaista.fi · acbca25d · e5546425 · aac5f57b
Commit aac5f57b authored Dec 07, 2004 by jani@ua141d10.elisa.omakaista.fi
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

sql/sql_parse.cc sql/sql_parse.cc +3 -1

No files found.
--- 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