Skip to content

M
mariadb
Commit e5852adc authored by unknown's avatar unknown
Browse files
Options

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

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
parents 34ffbfeb fa8dafe5
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
sql/opt_range.cc
View file @ e5852adc
...@@ -3776,6 +3776,7 @@ get_mm_leaf(PARAM *param, COND *conf_func, Field *field, KEY_PART *key_part, ...@@ -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, ...@@ -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))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7