diff options
| author | unknown <monty@mysql.com> | 2005-06-05 17:19:50 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-06-05 17:19:50 +0300 |
| commit | a3873bbb54da27911db6bd1d0e6c64be455a6ed7 (patch) | |
| tree | e71cd25539c70e1d293ee75eda9bbe9defa7ff74 /sql/sql_insert.cc | |
| parent | f9139afe9ab2910d65216db69af654fad4cea92f (diff) | |
| parent | 72ad8b152f32304671747f65a7b9864b96e99bae (diff) | |
| download | mariadb-git-a3873bbb54da27911db6bd1d0e6c64be455a6ed7.tar.gz | |
merge
client/mysql.cc:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_bitmap.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 8e4456a42a6..dbecfe1489e 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -128,7 +128,7 @@ static int check_insert_fields(THD *thd, TABLE_LIST *table_list, /* it is join view => we need to find table for update */ List_iterator_fast<Item> it(fields); Item *item; - TABLE_LIST *tbl= 0; + TABLE_LIST *tbl= 0; // reset for call to check_single_table() table_map map= 0; while ((item= it++)) @@ -1012,6 +1012,7 @@ ok_or_after_trg_err: err: info->last_errno= error; + thd->lex->current_select->no_error= 0; // Give error table->file->print_error(error,MYF(0)); before_trg_err: |