Commit f3ab62a1 authored by unknown's avatar unknown

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
...@@ -2600,7 +2600,9 @@ mysql_execute_command(THD *thd) ...@@ -2600,7 +2600,9 @@ mysql_execute_command(THD *thd)
check_access(thd, SELECT_ACL | EXTRA_ACL, tables->db, check_access(thd, SELECT_ACL | EXTRA_ACL, tables->db,
&tables->grant.privilege,0,0)) &tables->grant.privilege,0,0))
goto error; 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; break;
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment