diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-11-03 16:43:04 +0200 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-11-03 16:43:04 +0200 |
| commit | e5852adccf13b02913e050638746bafe7541ef5e (patch) | |
| tree | 7d8a06e71f12049c6f789f9bb813ebd4eb144f34 | |
| parent | 34ffbfebf26be4dcfe647293f068c06ca8cfa202 (diff) | |
| parent | fa8dafe5bba7b4c72c1e0bbf10d7a9e10b4ebe8a (diff) | |
| download | mariadb-git-e5852adccf13b02913e050638746bafe7541ef5e.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
| -rw-r--r-- | sql/opt_range.cc | 3 |
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)) |