database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50

Browse Source 
into  maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/51
This commit is contained in:
tsmith@maint2.mysql.com
2006-09-13 09:03:52 +02:00
parent a1c4a48b7e e38f04a09f
commit 6a31ec2cad
39 changed files with 612 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/opt_range.cc
View File

@ -5427,6 +5427,7 @@ get_mm_leaf(RANGE_OPT_PARAM *param, COND *conf_func, Field *field,
MEM_ROOT *alloc= param->mem_root;
char *str;
ulong orig_sql_mode;
int err;
DBUG_ENTER("get_mm_leaf");
/*
@ -5581,7 +5582,13 @@ get_mm_leaf(RANGE_OPT_PARAM *param, COND *conf_func, Field *field,
(field->type() == FIELD_TYPE_DATE ||
field->type() == FIELD_TYPE_DATETIME))
field->table->in_use->variables.sql_mode|= MODE_INVALID_DATES;
if (value->save_in_field_no_warnings(field, 1) < 0)
err= value->save_in_field_no_warnings(field, 1);
if (err > 0 && field->cmp_type() != value->result_type())
{
tree= 0;
goto end;
}
if (err < 0)
{
field->table->in_use->variables.sql_mode= orig_sql_mode;
/* This happens when we try to insert a NULL field in a not null column */