bk commit into 5.0 tree (evgen:1.1969) BUG#14093

[eugene]

Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1969 05/11/03 17:43:03 evgen@stripped +1 -0
  opt_range.cc:
    Additional fix for bug#14093

  sql/opt_range.cc
    1.196 05/11/03 17:42:03 evgen@stripped +2 -1
    Additional fix for bug#14093

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	evgen
# Host:	moonbone.local
# Root:	/work/14093-bug-5.0-mysql

--- 1.195/sql/opt_range.cc	2005-11-03 15:24:47 +03:00
+++ 1.196/sql/opt_range.cc	2005-11-03 17:42:03 +03:00
@@ -3776,6 +3776,7 @@
   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 @@
       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))