1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
This commit is contained in:
kaa@polly.local 2006-12-08 23:47:49 +03:00
commit d9dc018226
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/func_in.result
View File

@ -350,6 +350,10 @@ 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
create table t1(f1 char(1)); create table t1(f1 char(1));

7
mysql-test/t/func_in.test
View File

@ -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;

3
sql/opt_range.cc
View File

@ -5012,7 +5012,8 @@ static SEL_TREE *get_func_mm_tree(RANGE_OPT_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;