diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-08-03 16:09:44 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-08-03 16:09:44 +0300 |
| commit | 8919dea9cdf65389b8981d3cb6824d383b03423e (patch) | |
| tree | 0065a10c05f09bf8b4552758939576206cebc64b | |
| parent | ce04b6fad7e6b2ad6ed8759923c51d906edcb288 (diff) | |
| parent | 4929111672a025023473bf542ca7d03e1014f4ef (diff) | |
| download | mariadb-git-8919dea9cdf65389b8981d3cb6824d383b03423e.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
Docs/manual.texi:
Auto merged
| -rw-r--r-- | Docs/manual.texi | 4 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 2 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi index 7ab56b2e3c0..bd0a03b0f81 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -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 diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 33229b4cb4c..69abe813eed 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -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; diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 2ecebcfdbb8..ade69236e96 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -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; |