diff options
| author | dlenev@brandersnatch.localdomain <> | 2004-10-20 16:04:43 +0400 |
|---|---|---|
| committer | dlenev@brandersnatch.localdomain <> | 2004-10-20 16:04:43 +0400 |
| commit | 75d816627c6e900519ee89df522a584f4d5afb91 (patch) | |
| tree | cc5a947dac611d8db606dd3485b05f87a26b8bcd /sql/sql_prepare.cc | |
| parent | 1354b1bd5d3aa139cadb121816cc8331452e6651 (diff) | |
| download | mariadb-git-75d816627c6e900519ee89df522a584f4d5afb91.tar.gz | |
Fix for bug #6173 "One can circumvent missing UPDATE privilege if
he has SELECT and INSERT privileges for table with primary key"
Now we set lex->duplicates= DUP_UPDATE right in parser if INSERT has
ON DUPLICATE KEY UPDATE clause, this simplifies insert_precheck()
function (this also fixes a bug) and some other code.
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 27d98fdfeba..0392b4e5cd6 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -895,10 +895,9 @@ static int mysql_test_insert(Prepared_statement *stmt, int res= -1; TABLE_LIST *insert_table_list= (TABLE_LIST*) lex->select_lex.table_list.first; - my_bool update= (lex->value_list.elements ? UPDATE_ACL : 0); DBUG_ENTER("mysql_test_insert"); - if ((res= insert_precheck(thd, table_list, update))) + if ((res= insert_precheck(thd, table_list))) DBUG_RETURN(res); /* @@ -1388,8 +1387,7 @@ static int send_prepare_results(Prepared_statement *stmt, bool text_protocol) res= mysql_test_insert(stmt, tables, lex->field_list, lex->many_values, select_lex->item_list, lex->value_list, - (lex->value_list.elements ? - DUP_UPDATE : lex->duplicates)); + lex->duplicates); break; case SQLCOM_UPDATE: |