bk commit into 5.0 tree (kaa:1.2347)

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.0 repository of kaa. When kaa 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@stripped, 2006-12-08 22:38:03+03:00, kaa@stripped +3 -0
  Merge polly.local:/tmp/maint/bug24261/my50-bug24261
  into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
  MERGE: 1.2248.180.1

  mysql-test/r/func_in.result@stripped, 2006-12-08 22:37:59+03:00, kaa@stripped +0 -0
    Auto merged
    MERGE: 1.28.1.1

  mysql-test/t/func_in.test@stripped, 2006-12-08 22:37:59+03:00, kaa@stripped +0 -0
    Auto merged
    MERGE: 1.22.1.1

  sql/opt_range.cc@stripped, 2006-12-08 22:37:59+03:00, kaa@stripped +0 -0
    Auto merged
    MERGE: 1.231.1.1

# 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:	kaa
# Host:	polly.local
# Root:	/home/kaa/src/maint/mysql-5.0-maint/RESYNC

--- 1.234/sql/opt_range.cc	2006-12-08 22:38:09 +03:00
+++ 1.235/sql/opt_range.cc	2006-12-08 22:38:09 +03:00
@@ -3703,7 +3703,8 @@ static SEL_TREE *get_func_mm_tree(PARAM 
             for (uint idx= 0; idx < param->keys; idx++)
             {
               SEL_ARG *new_interval, *last_val;
-              if (((new_interval= tree2->keys[idx])) && 
+              if (((new_interval= tree2->keys[idx])) &&
+                  (tree->keys[idx]) &&
                   ((last_val= tree->keys[idx]->last())))
               {
                 new_interval->min_value= last_val->max_value;

--- 1.29/mysql-test/r/func_in.result	2006-12-08 22:38:09 +03:00
+++ 1.30/mysql-test/r/func_in.result	2006-12-08 22:38:09 +03:00
@@ -350,5 +350,9 @@ select some_id from t1 where some_id not
 some_id
 1
 2
+select some_id from t1 where some_id not in('-1', '0');
+some_id
+1
+2
 drop table t1;
 End of 5.0 tests

--- 1.23/mysql-test/t/func_in.test	2006-12-08 22:38:09 +03:00
+++ 1.24/mysql-test/t/func_in.test	2006-12-08 22:38:09 +03:00
@@ -252,6 +252,13 @@ insert into t1 values (1),(2);
 select some_id from t1 where some_id not in(2,-1);
 select some_id from t1 where some_id not in(-4,-1,-4);
 select some_id from t1 where some_id not in(-4,-1,3423534,2342342);
+
+#
+# BUG#24261: crash when WHERE contains NOT IN ('<negative value>') for unsigned
column type
+#
+
+select some_id from t1 where some_id not in('-1', '0');
+
 drop table t1;