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

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

into sinisa.nasamreza.org:/mnt/work/mysql-4.0
parents 193c383e 1ac7e54b

Docs/manual.texi

+4 −0
Original line number Diff line number Diff line
@@ -50088,6 +50088,10 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}. 














@itemize @bullet















@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 















initialization method and ref_length's are of different sizes















@item 

























sql/sql_parse.cc



+1
−1






























Original line number
Diff line number
Diff line








@@ -1469,7 +1469,7 @@ mysql_execute_command(void)













				 (TABLE_LIST *)















				 lex->create_info.merge_list.first))















      goto error;				/* purecov: inspected */













    if (grant_option)













    if (grant_option && want_priv != CREATE_TMP_ACL)















    {















      /* Check that the first table has CREATE privilege */















      TABLE_LIST *tmp_table_list=tables->next;

































sql/sql_yacc.yy



+1
−0






























Original line number
Diff line number
Diff line








@@ -3445,6 +3445,7 @@ revoke:













	  lex->columns.empty();















	  lex->grant= lex->grant_tot_col=0;















	  lex->select->db=0;













	  bzero(&(lex->mqh),sizeof(lex->mqh));















	}















	grant_privileges ON opt_table FROM user_list;