database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge host.loc:/home/uchum/work/5.1-opt-33699

Browse Source 
into  host.loc:/home/uchum/work/5.1-opt
This commit is contained in:
gshchepa/uchum@host.loc
2008-01-11 21:39:45 +04:00
parent 0ef58cfe6b 32d13ab23d
commit 17c5117872
18 changed files with 40 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_update.cc
View File

@ -526,7 +526,9 @@ int mysql_update(THD *thd,
init_read_record(&info,thd,table,select,0,1);
updated= found= 0;
thd->count_cuted_fields= CHECK_FIELD_WARN; /* calc cuted fields */
/* 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;
thd->cuted_fields=0L;
thd->proc_info="Updating";