diff options
| author | evgen@moonbone.local <> | 2007-05-23 23:31:33 +0400 |
|---|---|---|
| committer | evgen@moonbone.local <> | 2007-05-23 23:31:33 +0400 |
| commit | 559063177f7d2c06394a484500eec873efd706af (patch) | |
| tree | ff5341dda3dfecc65855c4a3f48ab54289ac810e /sql/sql_base.cc | |
| parent | debb054d4a155a8d70f3431cd281901fd210a98e (diff) | |
| parent | d1d58b5f1d9a0bee5651217809f4ad61a0c44d5a (diff) | |
| download | mariadb-git-559063177f7d2c06394a484500eec873efd706af.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
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; |