diff options
| author | unknown <dlenev@mysql.com> | 2004-10-20 17:02:15 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2004-10-20 17:02:15 +0400 |
| commit | 1d3c05901a959c43e655523d4202ff4db58bdd81 (patch) | |
| tree | d205110e5c685cbe75039f3cf7cb8a950c01d368 /sql/sql_prepare.cc | |
| parent | 6d3e14a1c62f920674214becd8278ab51bf83911 (diff) | |
| parent | b88150c96edf457099922a7e0a11831160bc5a67 (diff) | |
| download | mariadb-git-1d3c05901a959c43e655523d4202ff4db58bdd81.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-secfix
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
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 1bd359ec9ec..239ff13f261 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: |