database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1

Browse Source 
into eagle.mysql.r18.ru:/home/vva/work/BUG_663/mysql-4.1
This commit is contained in:
vva@eagle.mysql.r18.ru
2003-07-22 19:02:36 -04:00
parent 52e043fd44 f32299279d
commit 99aa453f37
10 changed files with 71 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/field_conv.cc
View File

@ -172,7 +172,10 @@ set_field_to_null_with_conversions(Field *field, bool no_conversions)
}
field->reset();
if (field == field->table->next_number_field)
{
field->table->auto_increment_field_is_null= true;
return 0; // field is set in handler.cc
}
if (current_thd->count_cuted_fields)
{
field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN,ER_WARN_NULL_TO_NOTNULL);