diff options
| author | unknown <evgen@moonbone.local> | 2007-05-23 23:31:33 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-05-23 23:31:33 +0400 |
| commit | c57d6f729db784d02a0d0d62f1f9d03ab22fcfda (patch) | |
| tree | ff5341dda3dfecc65855c4a3f48ab54289ac810e /sql/sql_base.cc | |
| parent | f7f593ae7dde682e449fe81d946a83f74f0deb6a (diff) | |
| parent | 1734b4e99068a135c0b7d49f8bb3b463b3cb0ef3 (diff) | |
| download | mariadb-git-c57d6f729db784d02a0d0d62f1f9d03ab22fcfda.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/mnt/gentoo64/work/27563-bug-5.0-opt-mysql
sql/item_func.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 0b5922d8737..8c7627d9fe4 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -5805,7 +5805,7 @@ fill_record(THD *thd, Field **ptr, List<Item> &values, bool ignore_errors) table= (*ptr)->table; table->auto_increment_field_not_null= FALSE; } - while ((field = *ptr++)) + while ((field = *ptr++) && !thd->net.report_error) { value=v++; table= field->table; |