Commit d858c08b authored by Sinisa@sinisa.nasamreza.org's avatar Sinisa@sinisa.nasamreza.org

Merge sinisa@work.mysql.com:/home/bk/mysql-4.0

into sinisa.nasamreza.org:/mnt/work/mysql-4.0
parents 193c383e 1ac7e54b
...@@ -50088,6 +50088,10 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}. ...@@ -50088,6 +50088,10 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}.
@itemize @bullet @itemize @bullet
@item @item
Fixed bug in REVOKE that caused user resources to be randomly set
@item
Fixed bug with a new GRANT on TEMP TABLES
@item
Fixed bug in multi-table delete when tables are re-ordered in table Fixed bug in multi-table delete when tables are re-ordered in table
initialization method and ref_length's are of different sizes initialization method and ref_length's are of different sizes
@item @item
...@@ -1469,7 +1469,7 @@ mysql_execute_command(void) ...@@ -1469,7 +1469,7 @@ mysql_execute_command(void)
(TABLE_LIST *) (TABLE_LIST *)
lex->create_info.merge_list.first)) lex->create_info.merge_list.first))
goto error; /* purecov: inspected */ goto error; /* purecov: inspected */
if (grant_option) if (grant_option && want_priv != CREATE_TMP_ACL)
{ {
/* Check that the first table has CREATE privilege */ /* Check that the first table has CREATE privilege */
TABLE_LIST *tmp_table_list=tables->next; TABLE_LIST *tmp_table_list=tables->next;
......
...@@ -3445,6 +3445,7 @@ revoke: ...@@ -3445,6 +3445,7 @@ revoke:
lex->columns.empty(); lex->columns.empty();
lex->grant= lex->grant_tot_col=0; lex->grant= lex->grant_tot_col=0;
lex->select->db=0; lex->select->db=0;
bzero(&(lex->mqh),sizeof(lex->mqh));
} }
grant_privileges ON opt_table FROM user_list; grant_privileges ON opt_table FROM user_list;
......
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