Commit 3288ddf6 authored by unknown's avatar unknown

Merge polly.local:/tmp/maint/bug24261/my50-bug24261

into  polly.local:/home/kaa/src/maint/mysql-5.0-maint


mysql-test/r/func_in.result:
  Auto merged
mysql-test/t/func_in.test:
  Auto merged
sql/opt_range.cc:
  Auto merged
parents 8b5787fa 2e758a7c
...@@ -350,5 +350,9 @@ select some_id from t1 where some_id not in(-4,-1,3423534,2342342); ...@@ -350,5 +350,9 @@ select some_id from t1 where some_id not in(-4,-1,3423534,2342342);
some_id some_id
1 1
2 2
select some_id from t1 where some_id not in('-1', '0');
some_id
1
2
drop table t1; drop table t1;
End of 5.0 tests End of 5.0 tests
...@@ -252,6 +252,13 @@ insert into t1 values (1),(2); ...@@ -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(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,-4);
select some_id from t1 where some_id not in(-4,-1,3423534,2342342); 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; drop table t1;
......
...@@ -3703,7 +3703,8 @@ static SEL_TREE *get_func_mm_tree(PARAM *param, Item_func *cond_func, ...@@ -3703,7 +3703,8 @@ static SEL_TREE *get_func_mm_tree(PARAM *param, Item_func *cond_func,
for (uint idx= 0; idx < param->keys; idx++) for (uint idx= 0; idx < param->keys; idx++)
{ {
SEL_ARG *new_interval, *last_val; 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()))) ((last_val= tree->keys[idx]->last())))
{ {
new_interval->min_value= last_val->max_value; new_interval->min_value= last_val->max_value;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment