mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse source 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
This commit is contained in:
unknown 2005-11-03 16:43:04 +02:00
commit e5852adccf
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sql/opt_range.cc
View file

@ -3776,6 +3776,7 @@ get_mm_leaf(PARAM *param, COND *conf_func, Field *field, KEY_PART *key_part,
SEL_ARG *tree= 0; SEL_ARG *tree= 0;
MEM_ROOT *alloc= param->mem_root; MEM_ROOT *alloc= param->mem_root;
char *str; char *str;
ulong orig_sql_mode;
DBUG_ENTER("get_mm_leaf"); DBUG_ENTER("get_mm_leaf");
/* /*
@ -3922,7 +3923,7 @@ get_mm_leaf(PARAM *param, COND *conf_func, Field *field, KEY_PART *key_part,
field->cmp_type() != value->result_type()) field->cmp_type() != value->result_type())
goto end; goto end;
/* For comparison purposes allow invalid dates like 2000-01-32 */ /* For comparison purposes allow invalid dates like 2000-01-32 */
ulong orig_sql_mode= field->table->in_use->variables.sql_mode; orig_sql_mode= field->table->in_use->variables.sql_mode;
if (value->real_item()->type() == Item::STRING_ITEM && if (value->real_item()->type() == Item::STRING_ITEM &&
(field->type() == FIELD_TYPE_DATE || (field->type() == FIELD_TYPE_DATE ||
field->type() == FIELD_TYPE_DATETIME)) field->type() == FIELD_TYPE_DATETIME))