Commit f3ab62a1 authored by unknown's avatar unknown
Browse files

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

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


sql/sql_parse.cc:
  Auto merged
parents 86f19614 d74a3faf
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -2600,6 +2600,8 @@ mysql_execute_command(THD *thd)
	  check_access(thd, SELECT_ACL | EXTRA_ACL, tables->db,
		       &tables->grant.privilege,0,0))
	goto error;
      if (grant_option && check_grant(thd, SELECT_ACL, tables, 2, UINT_MAX, 0))
	goto error;
      res= mysqld_show_create(thd, tables);
      break;
    }