diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-03-11 16:32:42 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-03-11 16:32:42 +0100 |
| commit | b0fcbc84ef609b1147c3624e90fe3dac66ef8c1d (patch) | |
| tree | ee09976ab4dd9dee924a4c7e30eb0fc9f5e7d63f /sql/sql_update.cc | |
| parent | a15d25f07e56cbd80aecbeadef635d3b55e00e85 (diff) | |
| parent | 11570d64fcffa66feaf1fdb8072fdfb9dbd865ca (diff) | |
| download | mariadb-git-b0fcbc84ef609b1147c3624e90fe3dac66ef8c1d.tar.gz | |
merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 181ff82f0fe..eb7ccd75a75 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -526,9 +526,11 @@ int mysql_update(THD *thd, init_read_record(&info, thd, table, select, 0, 1, FALSE); updated= found= 0; - /* Generate an error when trying to set a NOT NULL field to NULL. */ - thd->count_cuted_fields= ignore ? CHECK_FIELD_WARN - : CHECK_FIELD_ERROR_FOR_NULL; + /* + Generate an error (in TRADITIONAL mode) or warning + when trying to set a NOT NULL field to NULL. + */ + thd->count_cuted_fields= CHECK_FIELD_WARN; thd->cuted_fields=0L; thd_proc_info(thd, "Updating"); |