diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2009-02-17 13:24:09 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2009-02-17 13:24:09 +0100 |
| commit | 6db314c628b103b7c4d7fc0ba4c21eda6e6a349e (patch) | |
| tree | 8414a0bf16f74515368a6a4ebc7ea528e8f982a2 /sql/sql_update.cc | |
| parent | 805e8ffb9ec3ae7b9353d65f33e4eb20284876ae (diff) | |
| parent | 6bd93f670271eaf2bd79bd7fa538e9baaa7dcb0f (diff) | |
| download | mariadb-git-6db314c628b103b7c4d7fc0ba4c21eda6e6a349e.tar.gz | |
Merged Performance Version 0.2.1 with latest 5.1 tree (last push 11 feb 14.01.13 2009)
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 49ec1a33873..1edd6952a34 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -528,9 +528,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"); |