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

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp

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))