diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-01-24 00:09:23 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-01-24 00:09:23 +0300 |
| commit | 7b5f5d5c37b0a59a04645007cc44446274666832 (patch) | |
| tree | 5e503468493119925995d64ea920534747a99d04 /sql/item.cc | |
| parent | 12318ab2a3a80b2230de8c7d98060b41a6972e25 (diff) | |
| parent | ed79d2ecbbb6b88d328dd32cba3e53051744e9dc (diff) | |
| download | mariadb-git-7b5f5d5c37b0a59a04645007cc44446274666832.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index ba920497ec1..b52619ceee0 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -5305,7 +5305,7 @@ int Item::save_in_field(Field *field, bool no_conversions) field->set_notnull(); error=field->store(nr, unsigned_flag); } - return error; + return error ? error : (field->table->in_use->is_error() ? 2 : 0); } |