diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-10-28 11:02:48 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-10-28 11:02:48 +0300 |
| commit | 46ce3d00921491398d2e9a00c2b03e67540dee23 (patch) | |
| tree | 70b19d638c9beac263179291143f76c5af8757f4 /sql/sql_insert.cc | |
| parent | 93678f6bd9be1d320a63ae3fcf24493dae065ae7 (diff) | |
| parent | f41bba8c6156a7adf4c67dfa75e16112767a5d3c (diff) | |
| download | mariadb-git-46ce3d00921491398d2e9a00c2b03e67540dee23.tar.gz | |
merge
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/log_event.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_rcontext.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 44a66095059..81f80378763 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -331,14 +331,6 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, break; } } - if ((res= table_list->view_check_option(thd, ignore_err)) == - VIEW_CHECK_SKIP) - continue; - else if (res == VIEW_CHECK_ERROR) - { - error= 1; - break; - } /* FIXME: Actually we should do this before @@ -348,6 +340,17 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, table->triggers->process_triggers(thd, TRG_EVENT_INSERT, TRG_ACTION_BEFORE); + if ((res= table_list->view_check_option(thd, + (values_list.elements == 1 ? + 0 : + ignore_err))) == + VIEW_CHECK_SKIP) + continue; + else if (res == VIEW_CHECK_ERROR) + { + error= 1; + break; + } #ifndef EMBEDDED_LIBRARY if (lock_type == TL_WRITE_DELAYED) { |