summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorevgen@moonbone.local <>2005-11-03 17:43:03 +0300
committerevgen@moonbone.local <>2005-11-03 17:43:03 +0300
commite92452c8ed4ac795e23a2f95d46fd50f6799be14 (patch)
treee7b3e85fd1c0cc9b3c7f19f5d16396ac49821311 /sql
parentd702915356de3288ef8eefce5c994db2cef53fc7 (diff)
downloadmariadb-git-e92452c8ed4ac795e23a2f95d46fd50f6799be14.tar.gz
opt_range.cc:
Additional fix for bug#14093
Diffstat (limited to 'sql')
-rw-r--r--sql/opt_range.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 22e9f94d21a..63a49a46110 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -3776,6 +3776,7 @@ get_mm_leaf(PARAM *param, COND *conf_func, Field *field, KEY_PART *key_part,
SEL_ARG *tree= 0;
MEM_ROOT *alloc= param->mem_root;
char *str;
+ ulong orig_sql_mode;
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())
goto end;
/* 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 &&
(field->type() == FIELD_TYPE_DATE ||
field->type() == FIELD_TYPE_DATETIME))